tina4ruby 3.13.2 → 3.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9136344be97c23d23b85f26a14f5a992cf7df49c16ff6d8a60c928461ab222b
-  data.tar.gz: ea8eb37ac2e183ff58551b4e513e37359075dd1aab8672ea16a02d99acae9980
+  metadata.gz: 6806b64505d23caba2d53a7b08b1411aa1e0ca924ea883d660dedae1c81f5766
+  data.tar.gz: e168b0a72f99e8cab66c1532a0909d480e10e330c65104749ec8dafb4e26837d
 SHA512:
-  metadata.gz: 1317a3d0298906f4470f46cb86288b1b0573364028b7d15244aa04447b69509132c7f443924368c75bb1461b146ff93ca5d0d8a418fa29825eb120221c72e135
-  data.tar.gz: fadb37d5d3a570212a75eb5f683fbf78bfe4af0e78128d96fb293c355c66631bd3bfad570a3d320e47c30da2209ec01ebacfe2be26edc1dc2c7dec13a819c0d0
+  metadata.gz: fd1d7d614b01886cb2e70ffcd04503ce3155073350f70dc92e6414816c5993a39b63b91965f49c30ea3275a6c72b62eea510ba64db74db0384ad925d7bdb0b76
+  data.tar.gz: 745992728883c28e11d3716977a9bb9e5f58d4a043b7aa285c6dc8113b8c95d3ffef10ac7b52aa339ef0172c308687f6c3004926af1daf1f4a3737601c008994

data/lib/tina4/env.rb

@@ -83,6 +83,14 @@ module Tina4
       "TINA4_SECRET" => "tina4-secret-change-me"
     }.freeze
 
+    # Typed env-var coercion — parity with tina4_python's Env class,
+    # tina4-php's Tina4\Env, and tina4-nodejs's Env. Truthy values
+    # (case-insensitive after strip): "1", "true", "on", "yes", "y", "t".
+    # Falsy: "0", "false", "off", "no", "n", "f", empty string. Anything
+    # else falls through to default.
+    TRUTHY = %w[1 true on yes y t].freeze
+    FALSY  = %w[0 false off no n f].freeze
+
     # Check if a value is truthy for env boolean checks.
     #
     # Accepts: "true", "True", "TRUE", "1", "yes", "Yes", "YES", "on", "On", "ON".
@@ -91,6 +99,58 @@ module Tina4
       %w[true 1 yes on].include?(val.to_s.strip.downcase)
     end
 
+    # Read an env var and coerce to Boolean. Returns +default+ when the
+    # var is unset or holds a value outside the TRUTHY/FALSY tables.
+    # Never raises — bad input falls through to default.
+    def self.bool(name, default: false)
+      raw = ENV[name.to_s]
+      return default if raw.nil?
+      token = raw.strip.downcase
+      return true  if TRUTHY.include?(token)
+      return false if FALSY.include?(token) || token.empty?
+      default
+    end
+
+    # Read an env var and coerce to Integer. Logs a warning via Tina4::Log
+    # (if loaded) and returns +default+ on parse failure. Never raises.
+    def self.int(name, default: 0)
+      raw = ENV[name.to_s]
+      return default if raw.nil?
+      Integer(raw.strip)
+    rescue ArgumentError, TypeError
+      log_warning("Env.int(#{name.inspect}): could not parse #{raw.inspect} as Integer — using default #{default.inspect}")
+      default
+    end
+
+    # Read an env var and coerce to Float. Logs a warning via Tina4::Log
+    # (if loaded) and returns +default+ on parse failure. Never raises.
+    def self.float(name, default: 0.0)
+      raw = ENV[name.to_s]
+      return default if raw.nil?
+      Float(raw.strip)
+    rescue ArgumentError, TypeError
+      log_warning("Env.float(#{name.inspect}): could not parse #{raw.inspect} as Float — using default #{default.inspect}")
+      default
+    end
+
+    # Read an env var as a String. Returns +default+ when unset.
+    # Whitespace is preserved — this is a pass-through for the raw env value,
+    # matching Python's Env.str semantics.
+    def self.str(name, default: "")
+      raw = ENV[name.to_s]
+      return default if raw.nil?
+      raw
+    end
+
+    # Emit a warning via Tina4::Log without creating a load-order dependency.
+    # Mirrors Python's Env._log_warning: silently skip if Log isn't loaded.
+    def self.log_warning(message)
+      Tina4::Log.warning(message) if defined?(Tina4::Log)
+    rescue NameError, StandardError
+      # Log not wired up yet (very early bootstrap) — swallow.
+    end
+    private_class_method :log_warning
+
     class << self
       def load_env(root_dir = Dir.pwd)
         env_file = resolve_env_file(root_dir)

data/lib/tina4/log.rb

@@ -203,8 +203,10 @@ module Tina4
         ts = utc_timestamp
         rid = get_request_id
         rid_str = rid ? " [#{rid}]" : ""
+        fn = caller_name
+        fn_str = fn ? " [#{fn}]" : ""
         ctx = @current_context && !@current_context.empty? ? " #{JSON.generate(@current_context)}" : ""
-        "#{ts} [#{level_str.ljust(7)}]#{rid_str} #{message}#{ctx}"
+        "#{ts} [#{level_str.ljust(7)}]#{rid_str}#{fn_str} #{message}#{ctx}"
       end
 
       def json_line(level, message)
@@ -216,10 +218,46 @@ module Tina4
         }
         rid = get_request_id
         entry[:request_id] = rid if rid
+        fn = caller_name
+        entry[:function] = fn if fn
         entry[:context] = @current_context if @current_context && !@current_context.empty?
         JSON.generate(entry)
       end
 
+      # Names that belong to Log itself — walk past them so the reported
+      # frame is the real caller (e.g. the route handler or service
+      # method that called Log.info). Kept as a Set for O(1) lookup.
+      OWN_FRAMES = %w[
+        caller_name format_line json_line log colorize write_to_file
+        debug info warning error critical
+      ].freeze
+
+      # Names that are noise — Ruby block labels, lambdas, top-level
+      # script frames. We skip these the same way Python skips <module>
+      # and <lambda>.
+      NOISE_FRAME_RE = /\A(?:block(?: \(\d+ levels\))? in |<top \(required\)>|<main>)/
+
+      # Return the name of the function that called Log.{debug,info,warning,error}.
+      # Active only when TINA4_LOG_FUNC=true (parity feature #41).
+      # Returns nil on any error so it never crashes a log call.
+      def caller_name
+        return nil unless Tina4::Env.bool("TINA4_LOG_FUNC")
+
+        # caller_locations(2, 16) skips this method + log() and gives us
+        # up to 16 frames to walk. We bail out the moment we hit a frame
+        # whose base_label isn't in OWN_FRAMES and isn't a block label.
+        locs = caller_locations(2, 16) || []
+        locs.each do |loc|
+          label = loc.base_label.to_s
+          next if OWN_FRAMES.include?(label)
+          next if label.empty? || NOISE_FRAME_RE.match?(label)
+          return label
+        end
+        nil
+      rescue StandardError
+        nil
+      end
+
       def colorize(level, line)
         color = case level
                 when :debug   then COLORS[:cyan]

data/lib/tina4/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tina4
-  VERSION = "3.13.2"
+  VERSION = "3.13.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.13.2
+  version: 3.13.3
 platform: ruby
 authors:
 - Tina4 Team