kirei 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 788221745d889864fe2ec7075cce289f6d44361dece7711fbe91ac24c16f693b
-  data.tar.gz: e03e3cf0c4c6db69bc0106107ccb002b8f472ba077ef457d88a84b92b188371f
+  metadata.gz: 86e3ce57ba0d801b5279632d302837a42195565c3daa66a2b5fbd6adb31f0176
+  data.tar.gz: a3ba957501c2603cc8cfba22282ab0c281ccf8227f99fedad78af0c980f3edd3
 SHA512:
-  metadata.gz: 30bef2a1458e1aeeebd774d577df1dc231b0cfa46fb7483b076b69ac05de1529527442599dca18bb278fec42e1a17888eee849feb1b3f81dd502fd92284dd879
-  data.tar.gz: 181df5735f94c222fc29e9bb3c18aa33340995925a324a18a0bb28e1001eaeaee24f8c7442cc5852adf31ae7e5e7a707743441e1c64a585e27039e7b50ba96da
+  metadata.gz: '078c2a848f346f8e25c0b9fcacc72d0d2e3b8f82620df2cffe4fee683e9d44aba43d3de635dd918449369617aa97362d2f66adba26d52c625565ff614eafe5d9'
+  data.tar.gz: a57e28a79ff8fe6bf47060550d11521b14112f22e15088a365bf7965ef0caa1a9f56a80e55571477cea8807c63775513fdd04eb63bda355f677ce5aba95d032d

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

@@ -15,6 +15,9 @@ module Cli
               # frozen_string_literal: true
 
               require "rake"
+              require_relative "app"
+
+              Dir.glob("#{Kirei::GEM_ROOT}/lib/tasks/**/*.rake").each { import(_1) }
 
               Dir.glob("lib/tasks/**/*.rake").each { import(_1) }
 

data/lib/kirei/routing/base.rb

@@ -8,6 +8,8 @@ module Kirei
     class Base
       extend T::Sig
 
+      NOT_FOUND = T.let([404, {}, ["Not Found"]], RackResponseType) # rubocop:disable Style/MutableConstant
+
       sig { params(params: T::Hash[String, T.untyped]).void }
       def initialize(params: {})
         @router = T.let(Router.instance, Router)
@@ -23,6 +25,7 @@ module Kirei
       sig { params(env: RackEnvType).returns(RackResponseType) }
       def call(env)
         start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
+        status = 500 # we use it in the "ensure" block, so we need to define early (Sorbet doesn't like `status ||= 418`)
 
         http_verb = Verb.deserialize(env.fetch("REQUEST_METHOD"))
         req_path = T.cast(env.fetch("REQUEST_PATH"), String)
@@ -33,7 +36,7 @@ module Kirei
         #
 
         route = router.get(http_verb, req_path)
-        return [404, {}, ["Not Found"]] if route.nil?
+        return NOT_FOUND if route.nil?
 
         params = case route.verb
                  when Verb::GET
@@ -66,7 +69,13 @@ module Kirei
         Kirei::Logging::Logger.call(
           level: Kirei::Logging::Level::INFO,
           label: "Request Started",
-          meta: params,
+          meta: {
+            "http.method" => route.verb.serialize,
+            "http.route" => route.path,
+            "http.host" => env.fetch("HTTP_HOST"),
+            "http.request_params" => params,
+            "http.client_ip" => env.fetch("CF-Connecting-IP", env.fetch("REMOTE_ADDR")),
+          },
         )
 
         statsd_timing_tags = {
@@ -101,7 +110,7 @@ module Kirei
           ::StatsD.measure("request", latency_in_ms, tags: statsd_timing_tags)
 
           Kirei::Logging::Logger.call(
-            level: Kirei::Logging::Level::INFO,
+            level: status >= 500 ? Kirei::Logging::Level::ERROR : Kirei::Logging::Level::INFO,
             label: "Request Finished",
             meta: { "response.body" => response_body, "response.latency_in_ms" => latency_in_ms },
           )

data/lib/kirei/services/runner.rb

@@ -10,12 +10,12 @@ module Kirei
       sig do
         type_parameters(:T)
           .params(
-            class_name: String,
+            class_name: T.untyped,
             log_tags: T::Hash[String, T.untyped],
-            _: T.proc.returns(T.type_parameter(:T)),
+            block: T.proc.returns(T.type_parameter(:T)),
           ).returns(T.type_parameter(:T))
       end
-      def self.call(class_name, log_tags: {}, &_)
+      def self.call(class_name, log_tags: {}, &block)
         start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
         service = yield
 
@@ -35,13 +35,20 @@ module Kirei
         ::StatsD.measure(class_name, latency_in_ms, tags: metric_tags)
 
         logtags = {
-          "service.name" => class_name,
+          "service.name" => class_name.to_s,
           "service.latency_in_ms" => latency_in_ms,
           "service.result" => result,
+          "service.source_location" => source_location(block),
         }
         logtags.merge!(log_tags)
+
         Logging::Logger.call(level: Logging::Level::INFO, label: "Service Finished", meta: logtags)
       end
+
+      sig { params(proc: T.proc.returns(T.untyped)).returns(String) }
+      private_class_method def self.source_location(proc)
+        proc.source_location.join(":").gsub(App.root.to_s, "")
+      end
     end
   end
 end

data/lib/kirei/version.rb

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

data/lib/tasks/routes.rake

@@ -0,0 +1,26 @@
+# typed: false
+# frozen_string_literal: true
+
+require_relative("../kirei")
+
+namespace :kirei do
+  desc "Prints all available routes"
+  task :routes do
+    router = Kirei::Routing::Router.instance
+
+    longest_path = router.routes.keys.map(&:length).max
+
+    routes_by_controller = router.routes.values.group_by(&:controller)
+
+    puts "\n"
+
+    routes_by_controller.each do |controller, routes|
+      puts "#{controller}:"
+      routes.each do |route|
+        verb = route.verb.serialize.upcase.ljust(7 + 3) # 7 is the length of the longest verb
+        puts "#{verb} #{route.path.ljust(longest_path + 1)} => ##{route.action}"
+      end
+      puts "\n"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kirei
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ludwig Reinmiedl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-19 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -203,6 +203,7 @@ files:
 - lib/kirei/services/result.rb
 - lib/kirei/services/runner.rb
 - lib/kirei/version.rb
+- lib/tasks/routes.rake
 - sorbet/rbi/shims/base_model.rbi
 - sorbet/rbi/shims/ruby.rbi
 homepage: https://github.com/swiknaba/kirei