tina4ruby 3.10.67 → 3.10.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5ba81bb86f837e23521b7b13d2ee313a0ac7e34bbf04371c4256d00b077c7f3
-  data.tar.gz: 9bb8a43825801b904b30bddcfbc51fedc74694bb04d37d404d33702338d40806
+  metadata.gz: 616f1c89797014131b2b43e8c7b5a9ca6f95ddb20627375e82043c8c2fd26698
+  data.tar.gz: f846cc82475f82545be62e916eb7bf9cc38acf6b00792bc4453da4a46b39abfb
 SHA512:
-  metadata.gz: 29819ac550ac637dbc6bd3fb3456e426a2311cdbabc6cbe9953d4b03317ecb5eca6f55f5f70b69f515db433135b221fb45320f7aad3ded354b56a9772f150da2
-  data.tar.gz: 2ae5fc934297b48c3352aab9bc6606dba1553adc91e989efe8b301a6163e291eeec9f79d592a2a781ea34528b13b75a6cf8d55714f4795b5da80984c9be6e165
+  metadata.gz: e4a317f3c88f2353a6a59312c02d50a130eac8b25b4925bb03160d54c2792012069fc84f0edef0c12510447f7e391e5e54a0af98edb91b57a3797a78d58b7584
+  data.tar.gz: 646e0e66ec3cb40f91c7a9978ee8e3ce35149740696872a078bf6b8b1f50bb5e1365640e3aa289eba035d78d877f851b4afc716f3337a905c5bc144282f0e8d1

data/lib/tina4/auth.rb

@@ -89,11 +89,11 @@ module Tina4
 
       # ── Token API (auto-selects HS256 or RS256) ─────────────────
 
-      def get_token(payload, expires_in: 3600)
+      def get_token(payload, expires_in: 60)
         now = Time.now.to_i
         claims = payload.merge(
           "iat" => now,
-          "exp" => now + expires_in,
+          "exp" => now + (expires_in * 60).to_i,
           "nbf" => now
         )
 
@@ -142,15 +142,23 @@ module Tina4
         { valid: false, error: e.message }
       end
 
-      def hash_password(password)
-        require "bcrypt"
-        BCrypt::Password.create(password)
+      def hash_password(password, salt = nil, iterations = 260000)
+        salt ||= SecureRandom.hex(16)
+        dk = OpenSSL::KDF.pbkdf2_hmac(password, salt: salt, iterations: iterations, length: 32, hash: "sha256")
+        "pbkdf2_sha256$#{iterations}$#{salt}$#{dk.unpack1('H*')}"
       end
 
       def check_password(password, hash)
-        require "bcrypt"
-        BCrypt::Password.new(hash) == password
-      rescue BCrypt::Errors::InvalidHash
+        parts = hash.split('$')
+        return false unless parts.length == 4 && parts[0] == 'pbkdf2_sha256'
+        iterations = parts[1].to_i
+        salt = parts[2]
+        expected = parts[3]
+        dk = OpenSSL::KDF.pbkdf2_hmac(password, salt: salt, iterations: iterations, length: 32, hash: "sha256")
+        actual = dk.unpack1('H*')
+        # Timing-safe comparison
+        OpenSSL.fixed_length_secure_compare(actual, expected)
+      rescue
         false
       end
 
@@ -165,7 +173,7 @@ module Tina4
         nil
       end
 
-      def refresh_token(token, expires_in: 3600)
+      def refresh_token(token, expires_in: 60)
         payload = valid_token(token)
         return nil unless payload
 
@@ -192,8 +200,9 @@ module Tina4
         expected ||= ENV["TINA4_API_KEY"] || ENV["API_KEY"]
         return false if expected.nil? || expected.empty?
         return false if provided.nil? || provided.empty?
+        return false if provided.length != expected.length
 
-        provided == expected
+        OpenSSL.fixed_length_secure_compare(provided, expected)
       end
 
       def auth_handler(&block)

data/lib/tina4/database.rb

@@ -280,9 +280,33 @@ module Tina4
       { success: true }
     end
 
+    # Return the last execute() error message, or nil.
+    def get_error
+      @last_error
+    end
+
+    # Return the last insert ID from execute() or insert().
+    def get_last_id
+      current_driver.last_insert_id
+    rescue
+      nil
+    end
+
+    # Execute a write statement. Returns true/false for simple writes.
+    # Returns DatabaseResult if SQL contains RETURNING, CALL, EXEC, or SELECT.
     def execute(sql, params = [])
       cache_invalidate if @cache_enabled
-      current_driver.execute(sql, params)
+      result = current_driver.execute(sql, params)
+      @last_error = nil
+      sql_upper = sql.strip.upcase
+      if sql_upper.include?("RETURNING") || sql_upper.start_with?("CALL ") ||
+         sql_upper.start_with?("EXEC ") || sql_upper.start_with?("SELECT ")
+        return result
+      end
+      true
+    rescue => e
+      @last_error = e.message
+      false
     end
 
     def execute_many(sql, params_list = [])

data/lib/tina4/graphql.rb

@@ -768,6 +768,42 @@ module Tina4
       { "data" => nil, "errors" => [{ "message" => "Internal error: #{e.message}" }] }
     end
 
+    # Return schema as GraphQL SDL string.
+    def schema
+      sdl = ""
+      @schema.types.each do |name, type_obj|
+        sdl += "type #{name} {\n"
+        type_obj.fields.each { |f| sdl += "  #{f[:name]}: #{f[:type]}\n" }
+        sdl += "}\n\n"
+      end
+      unless @schema.queries.empty?
+        sdl += "type Query {\n"
+        @schema.queries.each do |name, config|
+          args = (config[:args] || {}).map { |k, v| "#{k}: #{v}" }.join(", ")
+          arg_str = args.empty? ? "" : "(#{args})"
+          sdl += "  #{name}#{arg_str}: #{config[:type]}\n"
+        end
+        sdl += "}\n\n"
+      end
+      unless @schema.mutations.empty?
+        sdl += "type Mutation {\n"
+        @schema.mutations.each do |name, config|
+          args = (config[:args] || {}).map { |k, v| "#{k}: #{v}" }.join(", ")
+          arg_str = args.empty? ? "" : "(#{args})"
+          sdl += "  #{name}#{arg_str}: #{config[:type]}\n"
+        end
+        sdl += "}\n\n"
+      end
+      sdl
+    end
+
+    # Return schema metadata for debugging.
+    def introspect
+      queries = @schema.queries.transform_values { |v| { type: v[:type], args: v[:args] || {} } }
+      mutations = @schema.mutations.transform_values { |v| { type: v[:type], args: v[:args] || {} } }
+      { types: @schema.types.keys, queries: queries, mutations: mutations }
+    end
+
     # Handle an HTTP request body (JSON string)
     def handle_request(body, context: {})
       payload = JSON.parse(body)

data/lib/tina4/orm.rb

@@ -414,7 +414,7 @@ module Tina4
           @persisted = true
         end
       end
-      true
+      self
     rescue => e
       @errors << e.message
       false
@@ -542,6 +542,7 @@ module Tina4
 
     alias to_hash to_h
     alias to_dict to_h
+    alias to_assoc to_h
     alias to_object to_h
 
     def to_array
@@ -672,5 +673,11 @@ module Tina4
 
       related_class.find(fk_value)
     end
+
+    # Instance-level aliases matching Python/PHP/Node.js naming
+    # These are imperative relationship queries (not class-level declarations)
+    alias imperative_has_one query_has_one
+    alias imperative_has_many query_has_many
+    alias imperative_belongs_to query_belongs_to
   end
 end

data/lib/tina4/queue.rb

@@ -147,28 +147,49 @@ module Tina4
     #   # Or as an enumerator:
     #   queue.consume("emails").each { |job| process(job) }
     #
-    def consume(topic = nil, id: nil, &block)
+    # Consume jobs from a topic using a long-running generator.
+    #
+    # Polls the queue continuously. When empty, sleeps for poll_interval
+    # seconds before polling again. No external while-loop or sleep needed.
+    #
+    #   queue.consume("emails") { |job| process(job) }
+    #   queue.consume("emails", poll_interval: 5) { |job| process(job) }
+    #   queue.consume("emails", id: "abc-123") { |job| process(job) }
+    #
+    def consume(topic = nil, id: nil, poll_interval: 1.0, &block)
       topic ||= @topic
 
+      if id
+        # Single job by ID — no polling
+        job = pop_by_id(topic, id)
+        if job
+          block_given? ? yield(job) : (return Enumerator.new { |y| y << job })
+        end
+        return block_given? ? nil : Enumerator.new { |_| }
+      end
+
+      # poll_interval=0 → single-pass drain (returns when empty)
+      # poll_interval>0 → long-running poll (sleeps when empty, never returns)
       if block_given?
-        if id
-          job = pop_by_id(topic, id)
-          yield job if job
-        else
-          while (job = @backend.dequeue(topic))
-            yield job
+        loop do
+          job = @backend.dequeue(topic)
+          if job.nil?
+            break if poll_interval <= 0
+            sleep(poll_interval)
+            next
           end
+          yield job
         end
       else
-        # Return an Enumerator when no block given
         Enumerator.new do |yielder|
-          if id
-            job = pop_by_id(topic, id)
-            yielder << job if job
-          else
-            while (job = @backend.dequeue(topic))
-              yielder << job
+          loop do
+            job = @backend.dequeue(topic)
+            if job.nil?
+              break if poll_interval <= 0
+              sleep(poll_interval)
+              next
             end
+            yielder << job
           end
         end
       end

data/lib/tina4/response.rb

@@ -45,6 +45,23 @@ module Tina4
       end
     end
 
+    # Callable response — auto-detects content type from data.
+    # Matches Python __call__ / PHP __invoke / Node response() pattern.
+    def call(data = nil, status_code = 200, content_type = nil)
+      @status_code = status_code
+      if content_type
+        @headers["content-type"] = content_type
+        @body = data.to_s
+      elsif data.is_a?(Hash) || data.is_a?(Array)
+        @headers["content-type"] = JSON_CONTENT_TYPE
+        @body = JSON.generate(data)
+      else
+        @headers["content-type"] = HTML_CONTENT_TYPE
+        @body = data.to_s
+      end
+      self
+    end
+
     def json(data, status_or_opts = nil, status: nil)
       @status_code = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
       @headers["content-type"] = JSON_CONTENT_TYPE

data/lib/tina4/session.rb

@@ -93,12 +93,19 @@ module Tina4
       end
     end
 
-    # Regenerate the session ID while preserving data
+    # Get flash data by key (alias for flash(key) without value)
+    def get_flash(key, default = nil)
+      result = flash(key)
+      result.nil? ? default : result
+    end
+
+    # Regenerate the session ID while preserving data — returns new ID
     def regenerate
       old_id = @id
       @id = SecureRandom.hex(32)
       @handler.destroy(old_id)
       @modified = true
+      @id
     end
 
     # Garbage collection: remove expired sessions from the handler

data/lib/tina4/version.rb

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

metadata

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