tina4ruby 3.13.74 → 3.13.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc9319e2cc05c631d4f456805dccecaf55f2cee47906a06624ff93c7f778c97
-  data.tar.gz: 871df06b691800d7eed0e9693b5b2ebecc131d0dec5c00084aa603142f0fb35d
+  metadata.gz: da6364e88c7169f37da6b3e667d31b9d736448190b6004f07405a5547fff2fb9
+  data.tar.gz: 5c98dd7dbf126623a6839b6b0c34b75f05ea2a123f2028602ed9857edd7452b9
 SHA512:
-  metadata.gz: 132581be6195fb4a7d9a90ac086903c1c4466776075ee0cdcef7256647ba9e147e3d14c7a198fbba1ef3594f2c9ec06497ce560ea3540763f0033526930157d6
-  data.tar.gz: da580bca2f664d573b0dc628fd2b90f7885bcf3cb58b72a49c74e2f1a240e343122de9e75f4e351fcccd5635d8cc2ecba725115d98c205f13816298680b98c91
+  metadata.gz: 972e3873fd9f9bc30171db684976ef9313321c3e7d82c10e09cdbcde43bda9a494d47f322e619f9bd2568f204b9f579589dd3b79c37092539905121176bd1c9c
+  data.tar.gz: 262a054d5b6a81a9b6b8f3101dedf70eff3c90117bc57a22a8e4cdbca65e3ea17a604fee65604291ad8c729fbc9b8002eddfbec1d63c24c35a3f4d58a32b861d

data/lib/tina4/migration.rb

@@ -648,22 +648,48 @@ module Tina4
       # record_migration path it is a standalone write, mirroring the Python
       # master's two-statement delete-then-insert.
       _remove_migration_record(name)
+
+      # Build the column list from the columns that ACTUALLY exist on the table,
+      # so a legacy column left behind by an in-place upgrade is populated rather
+      # than defaulted to NULL. Ruby never created a `migration_id` column, but a
+      # Ruby app can be pointed at a database whose tina4_migration table was
+      # created by tina4-python v3 <= 3.13.54 - there `migration_id` is NOT NULL,
+      # and an insert that omits it fails, wedging every migration on that
+      # database (tina4-python#93). Mirrors the PHP + Python masters.
+      cols = _tracking_columns
+      insert_cols = %w[migration_name description batch executed_at passed]
+      values = [name, desc, batch, executed_at, passed]
+
+      if cols.include?("migration_id")
+        insert_cols << "migration_id"
+        values << name
+      end
+
       if firebird?
         # Firebird: generate ID from sequence
         row = @db.fetch_one(
           "SELECT GEN_ID(GEN_TINA4_MIGRATION_ID, 1) AS NEXT_ID FROM RDB\$DATABASE"
         )
         next_id = row ? (row[:NEXT_ID] || row[:next_id] || 1).to_i : 1
-        @db.execute(
-          "INSERT INTO #{TRACKING_TABLE} (id, migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?, ?)",
-          [next_id, name, desc, batch, executed_at, passed]
-        )
-      else
-        @db.execute(
-          "INSERT INTO #{TRACKING_TABLE} (migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?)",
-          [name, desc, batch, executed_at, passed]
-        )
+        insert_cols.unshift("id")
+        values.unshift(next_id)
+      end
+
+      placeholders = Array.new(insert_cols.length, "?").join(", ")
+      @db.execute(
+        "INSERT INTO #{TRACKING_TABLE} (#{insert_cols.join(', ')}) VALUES (#{placeholders})",
+        values
+      )
+    end
+
+    # Lowercased column names on the tracking table; empty on any failure so a
+    # missing/unreadable table falls through to the canonical column list.
+    def _tracking_columns
+      (@db.columns(TRACKING_TABLE) || []).map do |c|
+        (c.is_a?(Hash) ? (c[:name] || c["name"]) : c).to_s.downcase
       end
+    rescue StandardError
+      []
     end
 
     def _remove_migration_record(name)

data/lib/tina4/rack_app.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "json"
 require "securerandom"
+require "time"
 require "uri"
 
 module Tina4
@@ -128,7 +129,7 @@ module Tina4
         end
 
         # Static files (only for non-API paths)
-        static_response = try_static(path)
+        static_response = try_static(path, env)
         return static_response if static_response
       end
 
@@ -386,30 +387,94 @@ module Tina4
       final_response.to_rack
     end
 
-    def try_static(path)
+    def try_static(path, env = nil)
       return nil if path.include?("..")
 
       @static_roots.each do |root|
         full_path = File.join(root, path)
         if File.file?(full_path)
-          return serve_static_file(full_path)
+          return serve_static_file(full_path, env)
         end
 
         # Only try index.html for directory-like paths
         if path.end_with?("/") || !path.include?(".")
           index_path = File.join(full_path, "index.html")
           if File.file?(index_path)
-            return serve_static_file(index_path)
+            return serve_static_file(index_path, env)
           end
         end
       end
       nil
     end
 
-    def serve_static_file(full_path)
+    # Serve a static asset with cache-revalidation semantics (parity with the
+    # Python master). A static file may be cached by the browser but MUST be
+    # revalidated before use, so a redeployed asset reaches the browser on the
+    # next load without a manual hard refresh — and an unchanged asset costs a
+    # cheap 304 round-trip, not a re-download.
+    #
+    # Validators are derived from the file's mtime + size (a weak ETag) plus a
+    # Last-Modified date, so we never have to read/hash the bytes to build them.
+    # When the request already carries a matching validator (If-None-Match, or
+    # If-Modified-Since not older than the file) we answer a bare 304 with no
+    # body. Stdlib only — no new dependency.
+    def serve_static_file(full_path, env = nil)
       ext = File.extname(full_path).downcase
       content_type = Tina4::Response::MIME_TYPES[ext] || "application/octet-stream"
-      [200, { "content-type" => content_type }, [File.binread(full_path)]]
+
+      stat = File.stat(full_path)
+      etag = %(W/"#{stat.mtime.to_i.to_s(16)}-#{stat.size.to_s(16)}")
+      last_modified = stat.mtime.httpdate
+
+      headers = {
+        "content-type" => content_type,
+        "cache-control" => "no-cache, must-revalidate",
+        "etag" => etag,
+        "last-modified" => last_modified
+      }
+
+      if env && static_not_modified?(env, etag, stat.mtime)
+        # 304 carries the validators (RFC 9110 §15.4.5) but NO body.
+        return [304, {
+          "cache-control" => "no-cache, must-revalidate",
+          "etag" => etag,
+          "last-modified" => last_modified
+        }, []]
+      end
+
+      [200, headers, [File.binread(full_path)]]
+    end
+
+    # Decide whether a conditional GET for a static asset can be answered 304.
+    # If-None-Match takes precedence over If-Modified-Since (RFC 9110 §13.1.3);
+    # ETag comparison is weak (a leading `W/` is ignored on either side).
+    def static_not_modified?(env, etag, mtime)
+      if_none_match = env["HTTP_IF_NONE_MATCH"]
+      if if_none_match && !if_none_match.empty?
+        return true if if_none_match.strip == "*"
+
+        want = weak_etag_value(etag)
+        return if_none_match.split(",").any? { |candidate| weak_etag_value(candidate) == want }
+      end
+
+      if_modified_since = env["HTTP_IF_MODIFIED_SINCE"]
+      if if_modified_since && !if_modified_since.empty?
+        begin
+          # HTTP dates have 1-second resolution — compare at whole seconds so a
+          # sub-second mtime never spuriously looks "newer" than the client copy.
+          return mtime.to_i <= Time.httpdate(if_modified_since).to_i
+        rescue ArgumentError
+          return false # Unparseable date — treat as no validator, serve the body.
+        end
+      end
+
+      false
+    end
+
+    # Normalise an ETag for weak comparison: drop a leading `W/` and surrounding
+    # whitespace so `W/"abc"` and `"abc"` compare equal.
+    def weak_etag_value(tag)
+      tag.to_s.strip.sub(/\AW\//, "")
     end
 
     def serve_swagger_ui

data/lib/tina4/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tina4ruby
 version: !ruby/object:Gem::Version
-  version: 3.13.74
+  version: 3.13.76
 platform: ruby
 authors:
 - Tina4 Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-13 00:00:00.000000000 Z
+date: 2026-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack