tina4ruby 0.5.2 → 3.2.1

data/lib/tina4/request.rb

@@ -13,20 +13,36 @@ module Tina4
       @path = env["PATH_INFO"] || "/"
       @query_string = env["QUERY_STRING"] || ""
       @content_type = env["CONTENT_TYPE"] || ""
-      @ip = env["REMOTE_ADDR"] || "127.0.0.1"
       @path_params = path_params
 
+      # Client IP with X-Forwarded-For support
+      @ip = extract_client_ip
+
       # Lazy-initialized fields (nil = not yet computed)
       @headers = nil
       @cookies = nil
       @session = nil
-      @body = nil
+      @body_raw = nil
       @params = nil
       @files = nil
       @json_body = nil
+      @query_hash = nil
+      @body_parsed = nil
+    end
+
+    # Full URL reconstruction
+    def url
+      scheme = env["rack.url_scheme"] || "http"
+      host = env["HTTP_HOST"] || env["SERVER_NAME"] || "localhost"
+      port = env["SERVER_PORT"]
+      url_str = "#{scheme}://#{host}"
+      url_str += ":#{port}" if port && port != "80" && port != "443"
+      url_str += @path
+      url_str += "?#{@query_string}" unless @query_string.empty?
+      url_str
     end
 
-    # Lazy accessors — only compute when needed
+    # Lazy accessors
     def headers
       @headers ||= extract_headers
     end
@@ -39,14 +55,26 @@ module Tina4
       @session ||= @env["tina4.session"] || {}
     end
 
+    # Raw body string
     def body
-      @body ||= read_body
+      @body_raw ||= read_body
+    end
+
+    # Parsed body (JSON or form data)
+    def body_parsed
+      @body_parsed ||= parse_body
+    end
+
+    # Parsed query string as hash
+    def query
+      @query_hash ||= parse_query_to_hash(@query_string)
     end
 
     def files
       @files ||= extract_files
     end
 
+    # Merged params: query + body + path_params (path_params highest priority)
     def params
       @params ||= build_params
     end
@@ -74,11 +102,22 @@ module Tina4
 
     private
 
+    def extract_client_ip
+      # Check X-Forwarded-For first (proxy/load balancer)
+      forwarded = @env["HTTP_X_FORWARDED_FOR"]
+      if forwarded && !forwarded.empty?
+        # Take the first (original client) IP
+        forwarded.split(",").first.strip
+      else
+        @env["HTTP_X_REAL_IP"] || @env["REMOTE_ADDR"] || "127.0.0.1"
+      end
+    end
+
     def extract_headers
       h = {}
       @env.each do |key, value|
         if key.start_with?("HTTP_")
-          h[key[5..].downcase] = value
+          h[key[5..-1].downcase] = value
         end
       end
       h
@@ -105,31 +144,38 @@ module Tina4
       data
     end
 
+    def parse_body
+      if @content_type.include?("application/json")
+        json_body
+      elsif @content_type.include?("application/x-www-form-urlencoded")
+        parse_query_to_hash(body)
+      else
+        {}
+      end
+    end
+
     def build_params
       p = {}
 
       # Query string params
-      parse_query_string(@query_string, p) unless @query_string.empty?
+      query.each { |k, v| p[k] = v }
 
       # Body params
-      if @content_type.include?("application/json")
-        json_body.each { |k, v| p[k.to_s] = v }
-      elsif @content_type.include?("application/x-www-form-urlencoded")
-        parse_query_string(body, p)
-      end
+      body_parsed.each { |k, v| p[k.to_s] = v }
 
       # Path params (highest priority)
       @path_params.each { |k, v| p[k.to_s] = v }
       p
     end
 
-    def parse_query_string(qs, target = {})
-      return target if qs.nil? || qs.empty?
+    def parse_query_to_hash(qs)
+      result = {}
+      return result if qs.nil? || qs.empty?
       qs.split("&").each do |pair|
         key, value = pair.split("=", 2)
-        target[URI.decode_www_form_component(key.to_s)] = URI.decode_www_form_component(value.to_s)
+        result[URI.decode_www_form_component(key.to_s)] = URI.decode_www_form_component(value.to_s)
       end
-      target
+      result
     end
 
     def extract_files

data/lib/tina4/response.rb

@@ -26,53 +26,63 @@ module Tina4
     TEXT_CONTENT_TYPE = "text/plain; charset=utf-8"
     XML_CONTENT_TYPE  = "application/xml; charset=utf-8"
 
-    attr_accessor :status, :headers, :body, :cookies
+    attr_accessor :status_code, :headers, :body, :cookies
 
     def initialize
-      @status = 200
+      @status_code = 200
       @headers = { "content-type" => HTML_CONTENT_TYPE }
       @body = ""
-      @cookies = nil  # Lazy — most responses have no cookies
+      @cookies = nil  # Lazy -- most responses have no cookies
+    end
+
+    # Chainable status setter
+    def status(code = nil)
+      if code.nil?
+        @status_code
+      else
+        @status_code = code
+        self
+      end
     end
 
     def json(data, status_or_opts = nil, status: nil)
-      @status = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
+      @status_code = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
       @headers["content-type"] = JSON_CONTENT_TYPE
       @body = data.is_a?(String) ? data : JSON.generate(data)
       self
     end
 
     def html(content, status_or_opts = nil, status: nil)
-      @status = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
+      @status_code = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
       @headers["content-type"] = HTML_CONTENT_TYPE
       @body = content.to_s
       self
     end
 
     def text(content, status_or_opts = nil, status: nil)
-      @status = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
+      @status_code = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 200)
       @headers["content-type"] = TEXT_CONTENT_TYPE
       @body = content.to_s
       self
     end
 
     def xml(content, status: 200)
-      @status = status
+      @status_code = status
       @headers["content-type"] = XML_CONTENT_TYPE
       @body = content.to_s
       self
     end
 
     def csv(content, filename: "export.csv", status: 200)
-      @status = status
+      @status_code = status
       @headers["content-type"] = "text/csv"
       @headers["content-disposition"] = "attachment; filename=\"#{filename}\""
       @body = content.to_s
       self
     end
 
-    def redirect(url, status: 302)
-      @status = status
+    def redirect(url, status_or_opts = nil, status: nil)
+      @status_code = status || (status_or_opts.is_a?(Integer) ? status_or_opts : 302)
       @headers["location"] = url
       @body = ""
       self
@@ -80,7 +90,7 @@ module Tina4
 
     def file(path, content_type: nil, download: false)
       unless ::File.exist?(path)
-        @status = 404
+        @status_code = 404
         @body = "File not found"
         return self
       end
@@ -94,22 +104,37 @@ module Tina4
     end
 
     def render(template_path, data = {}, status: 200)
-      @status = status
+      @status_code = status
       @headers["content-type"] = HTML_CONTENT_TYPE
       @body = Tina4::Template.render(template_path, data)
       self
     end
 
+    # Chainable header setter
+    def header(name, value = nil)
+      if value.nil?
+        @headers[name]
+      else
+        @headers[name] = value
+        self
+      end
+    end
+
+    # Chainable cookie setter
+    def cookie(name, value, opts = {})
+      set_cookie(name, value, opts)
+    end
+
     def set_cookie(name, value, opts = {})
-      cookie = "#{name}=#{URI.encode_www_form_component(value)}"
-      cookie += "; Path=#{opts[:path] || '/'}"
-      cookie += "; HttpOnly" if opts.fetch(:http_only, true)
-      cookie += "; Secure" if opts[:secure]
-      cookie += "; SameSite=#{opts[:same_site] || 'Lax'}"
-      cookie += "; Max-Age=#{opts[:max_age]}" if opts[:max_age]
-      cookie += "; Expires=#{opts[:expires].httpdate}" if opts[:expires]
+      cookie_str = "#{name}=#{URI.encode_www_form_component(value)}"
+      cookie_str += "; Path=#{opts[:path] || '/'}"
+      cookie_str += "; HttpOnly" if opts.fetch(:http_only, true)
+      cookie_str += "; Secure" if opts[:secure]
+      cookie_str += "; SameSite=#{opts[:same_site] || 'Lax'}"
+      cookie_str += "; Max-Age=#{opts[:max_age]}" if opts[:max_age]
+      cookie_str += "; Expires=#{opts[:expires].httpdate}" if opts[:expires]
       @cookies ||= []
-      @cookies << cookie
+      @cookies << cookie_str
       self
     end
 
@@ -132,16 +157,21 @@ module Tina4
       self
     end
 
+    # Flush / finalize -- alias for to_rack for semantic clarity
+    def send
+      to_rack
+    end
+
     def to_rack
       # Fast path: no cookies (99% of API responses)
       if @cookies.nil? || @cookies.empty?
-        return [@status, @headers, [@body.to_s]]
+        return [@status_code, @headers, [@body.to_s]]
       end
 
       # Cookie path
       final_headers = @headers.dup
       final_headers["set-cookie"] = @cookies.join("\n")
-      [@status, final_headers, [@body.to_s]]
+      [@status_code, final_headers, [@body.to_s]]
     end
 
     def self.auto_detect(result, response)
@@ -157,11 +187,11 @@ module Tina4
           response.text(result)
         end
       when Integer
-        response.status = result
+        response.status_code = result
         response.body = ""
         response
       when NilClass
-        response.status = 204
+        response.status_code = 204
         response.body = ""
         response
       else