primate-run 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f83843c5b0fa350eec8aa6c38b3d2bd3277707d8c8dbeff6c4d1f1a655ae31c
-  data.tar.gz: 25bb52f15b1d6bb0afa45098d230c132a5c61a7da54b717d88bf7771ed8694b0
+  metadata.gz: fd5815a95c686288ead6c2af8a81f56f36ad8c20a9a93939579626987680f160
+  data.tar.gz: cda12f8c3d71c1e12e27054228fa2306869d0bcbbf0d3afd36f5c1740710af0e
 SHA512:
-  metadata.gz: 94a76367d2d7d059a4e1bd7403228d339900bb663843b94746549b66fe7ce46bc5671926da67348e6fa1ca407aecc231be9da15a1681d76ea072e6c3fb4a3825
-  data.tar.gz: e6dbcc74893720e392afd29f82b50ed8790e00b96e81de31862c54a70404f99e5830e0cde2e0501a5d80c8709c864b6080b1dfa63633fc28895395f396556275
+  metadata.gz: 6801700e003b7dbd31bf8f7322e2388742c4093b769ded377d1f864130415b40b963e4673545d3c21b7427ad573b7ca7d8ce0a305fd58bffa34c8a47eee1b321
+  data.tar.gz: dbc173ba18b451c287747b067624a64cf68758268d3ea94f6925006841aaaf52ec6df05085bc5a3ac791ed27236da15728e86ebb42cf7d2aafcb37e7d57219df

data/lib/primate/i18n.rb

@@ -21,11 +21,7 @@ module I18N
     def t(key, params = nil)
       return key unless @current
 
-      if params.nil?
-        @current.t(key)
-      else
-        @current.t(key, params.to_json)
-      end
+      params.nil? ? @current.t(key) : @current.t(key, params.to_json)
     end
 
     # Locale accessor
@@ -43,7 +39,7 @@ module I18N
       #
       # @return [String] Current locale code
       def get
-        I18N.instance_variable_get(:@current)&.[]('locale')
+        I18N.instance_variable_get(:@current)&.[]("locale")
       end
 
       # Set the current locale

data/lib/primate/readable.rb

@@ -2,22 +2,25 @@
 
 module Primate
   class Readable
-    attr_reader :content_type
+    attr_reader :type
 
-    def initialize(typed_array, content_type = nil)
+    def initialize(typed_array, type = nil)
       @ta = typed_array
-      @content_type = content_type
+      @type = type
       @pos = 0
       @size = @ta[:length].to_i
     end
 
     def size = @size
     def eof? = @pos >= @size
-    def rewind; @pos = 0; self; end
+    def rewind
+      @pos = 0
+      self
+    end
 
     # return a binary string (ASCII-8BIT), advance position
     def read(n = nil)
-      return ''.b if eof?
+      return "".b if eof?
       n = n ? [n, @size - @pos].min : (@size - @pos)
       str = pack_range(@pos, n)
       @pos += n
@@ -60,7 +63,7 @@ module Primate
     private
 
     def pack_range(off, n)
-      Array.new(n) { |i| @ta[off + i].to_i }.pack('C*')
+      Array.new(n) { |i| @ta[off + i].to_i }.pack("C*")
     end
   end
 end

data/lib/primate/request.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'url'
-require_relative 'request_bag'
-require_relative 'request_body'
+require_relative "url"
+require_relative "request_bag"
+require_relative "request_body"
 
 class Request
   attr_reader :url, :body, :path, :query, :headers, :cookies
 
   def initialize(request, helpers)
-    @url = Primate::URL.new(request['url'])
-    @body = RequestBody.new(request['body'], helpers)
-    @path = RequestBag.new(request['path'], helpers)
-    @query = RequestBag.new(request['query'], helpers)
-    @headers = RequestBag.new(request['headers'], helpers)
-    @cookies = RequestBag.new(request['cookies'], helpers)
+    @url = Primate::URL.new(request["url"])
+    @body = RequestBody.new(request["body"], helpers)
+    @path = RequestBag.new(request["path"], helpers)
+    @query = RequestBag.new(request["query"], helpers)
+    @headers = RequestBag.new(request["headers"], helpers)
+    @cookies = RequestBag.new(request["cookies"], helpers)
   end
 end

data/lib/primate/request_bag.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'type'
+require_relative "type"
 
 class RequestBag
   # initialize with JavaScript object data
@@ -41,15 +41,6 @@ class RequestBag
     @data.key?(key) && !@data[key].nil?
   end
 
-  # Parse the entire bag with a schema
-  #
-  # @param schema [Object] Object with parse method
-  # @param coerce [Boolean] Whether to coerce types
-  # @return [Object] Parsed result
-  def parse(schema, coerce = false)
-    schema.parse(@data, coerce)
-  end
-
   # Convert to hash (Ruby standard conversion)
   #
   # @return [Hash] The underlying data

data/lib/primate/request_body.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'json'
-require_relative 'readable'
-require_relative 'uploaded_file'
+require "json"
+require_relative "readable"
+require_relative "uploaded_file"
 
 class Multipart
   attr_reader :form, :files
@@ -34,16 +34,17 @@ class RequestBody
   def multipart
     form = JSON.parse(@body.formSync.to_s)
     files_js = @body.filesSync
-    files = Array.new(files_js[:length].to_i) do |i|
-      f = files_js[i]
-      Primate::UploadedFile.new(
-        field: f['field'].to_s,
-        name:  f['name'].to_s,
-        type:  f['type'].to_s,
-        size:  f['size'].to_i,
-        bytes: f['bytes']
-      )
-    end
+    files =
+      Array.new(files_js[:length].to_i) do |i|
+        f = files_js[i]
+        Primate::UploadedFile.new(
+          field: f["field"].to_s,
+          name: f["name"].to_s,
+          type: f["type"].to_s,
+          size: f["size"].to_i,
+          bytes: f["bytes"]
+        )
+      end
     Multipart.new(form, files)
   end
 

data/lib/primate/response.rb

@@ -1,6 +1,40 @@
 # frozen_string_literal: true
 
 module Response
+  def self.page(props = {}, options = {})
+    { __PRMT__: "page", props: props, options: options }
+  end
+
+  def self.abort(options)
+    { __PRMT__: "abort", options: options }
+  end
+
+  def self.binary(body, options = {})
+    { __PRMT__: "binary", body: body, options: options }
+  end
+
+  def self.json(body, options = {})
+    { __PRMT__: "json", body: body, options: options }
+  end
+
+  def self.null
+    { __PRMT__: "null" }
+  end
+
+  def self.text(body, options = {})
+    { __PRMT__: "text", body: body, options: options }
+  end
+
+  def self.sse(options = {}, &body)
+    raise ArgumentError, "block required" unless body
+
+    { __PRMT__: "sse", body: body, options: options }
+  end
+
+  def self.ws(actions = {})
+    { __PRMT__: "ws", actions: actions }
+  end
+
   # Create a view response
   #
   # @param name [String] The view template name
@@ -8,7 +42,7 @@ module Response
   # @param options [Hash] Additional view options
   # @return [Hash] Response object for the Primate framework
   def self.view(name, props = {}, options = {})
-    { __PRMT__: 'view', name: name, props: props, options: options }
+    { __PRMT__: "view", name: name, props: props, options: options }
   end
 
   # Create a redirect response
@@ -17,7 +51,7 @@ module Response
   # @param options [Hash] Redirect options (status code, etc.)
   # @return [Hash] Response object for the Primate framework
   def self.redirect(location, status = nil)
-    result = { __PRMT__: 'redirect', location: location }
+    result = { __PRMT__: "redirect", location: location }
     result[:status] = status if status
     result
   end
@@ -27,6 +61,6 @@ module Response
   # @param options [Hash] Error options
   # @return [Hash] Response object for the Primate framework
   def self.error(options = {})
-    { __PRMT__: 'error', options: options }
+    { __PRMT__: "error", options: options }
   end
 end

data/lib/primate/route.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'request'
-require_relative 'response'
-require_relative 'i18n'
-require_relative '../primate'
+require_relative "request"
+require_relative "response"
+require_relative "i18n"
+require_relative "../primate"
 
 module Route
   @registry = Hash.new { |h, k| h[k] = {} }

data/lib/primate/session.rb

@@ -3,14 +3,16 @@
 # Session management
 module Session
   class << self
-    attr_accessor :current
-
     # Set the current session instance (called by framework)
     #
     # @param session_instance [SessionInstance] Session instance from JavaScript runtime
     # @return [void]
     def set_current(session_instance)
-      self.current = session_instance
+      Fiber[:primate_session] = session_instance
+    end
+
+    def current
+      Fiber[:primate_session]
     end
 
     # Get the session ID
@@ -81,14 +83,14 @@ class SessionInstance
   #
   # @return [String] Session identifier
   def id
-    @session['id']
+    @session["id"]
   end
 
   # Check if session exists
   #
   # @return [Boolean] True if session exists
   def exists
-    @session['exists']
+    @session["exists"]
   end
 
   # Create a new session with data
@@ -96,21 +98,21 @@ class SessionInstance
   # @param data [Hash] Initial session data
   # @return [void]
   def create(data)
-    @session.create(data)
+    @session.create(data).await
   end
 
   # Get session data (raises if no session)
   #
   # @return [Hash] Session data
   def get
-    @session.get
+    @session.get.await
   end
 
   # Try to get session data (returns empty if no session)
   #
   # @return [Hash] Session data or empty hash
   def try
-    @session.try
+    @session.try.await
   end
 
   # Set session data
@@ -118,13 +120,13 @@ class SessionInstance
   # @param data [Hash] Data to store in session
   # @return [void]
   def set(data)
-    @session.set(data)
+    @session.set(data).await
   end
 
   # Destroy the session
   #
   # @return [void]
   def destroy
-    @session.destroy
+    @session.destroy.await
   end
 end

data/lib/primate/type.rb

@@ -1,43 +1,34 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 def type(value, helpers)
   type = helpers.type(value).to_s
 
-  if type == 'integer'
-    return value.to_i
-  end
+  return value.to_i if type == "integer"
 
-  if type == 'float'
-    return value.to_f
-  end
+  return value.to_f if type == "float"
 
-  if type == 'boolean'
-    return value == JS::True
-  end
+  return value == JS::True if type == "boolean"
 
-  if type == 'string'
-    return value.to_s
-  end
+  return value.to_s if type == "string"
 
-  if type == 'nil'
-    return nil
-  end
+  return nil if type == "nil"
 
-  if type == 'array'
+  if type == "array"
     as_array = JS.global[:Array].from(value)
-    return Array.new(as_array[:length].to_i) {
-      type(as_array[_1], helpers)
-    }
+    return Array.new(as_array[:length].to_i) { type(as_array[_1], helpers) }
   end
 
-  if type == 'object'
+  if type == "object"
     as_entries = JS.global[:Object].entries(value)
-    return Hash[Array.new(as_entries[:length].to_i) {[
-      as_entries[_1][0].to_s,
-      type(as_entries[_1][1], helpers)
-    ]}]
+    return(
+      Hash[
+        Array.new(as_entries[:length].to_i) do
+          [as_entries[_1][0].to_s, type(as_entries[_1][1], helpers)]
+        end
+      ]
+    )
   end
 
   value

data/lib/primate/uploaded_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'readable'
+require_relative "readable"
 
 module Primate
   class UploadedFile

data/lib/primate/url.rb

@@ -2,23 +2,32 @@
 
 module Primate
   class URL
-    attr_reader :href, :origin, :protocol, :username, :password, :host,
-                :hostname, :port, :pathname, :search, :hash
+    attr_reader :href,
+                :origin,
+                :protocol,
+                :username,
+                :password,
+                :host,
+                :hostname,
+                :port,
+                :pathname,
+                :search,
+                :hash
 
     # initialize URL from JavaScript URL object
     # @param url [Object] JavaScript URL object from the runtime
     def initialize(url)
-      @href = url['href'].to_s
-      @origin = url['origin'].to_s
-      @protocol = url['protocol'].to_s
-      @username = url['username'].to_s
-      @password = url['password'].to_s
-      @host = url['host'].to_s
-      @hostname = url['hostname'].to_s
-      @port = url['port'].to_s
-      @pathname = url['pathname'].to_s
-      @search = url['search'].to_s
-      @hash = url['hash'].to_s
+      @href = url["href"].to_s
+      @origin = url["origin"].to_s
+      @protocol = url["protocol"].to_s
+      @username = url["username"].to_s
+      @password = url["password"].to_s
+      @host = url["host"].to_s
+      @hostname = url["hostname"].to_s
+      @port = url["port"].to_s
+      @pathname = url["pathname"].to_s
+      @search = url["search"].to_s
+      @hash = url["hash"].to_s
     end
   end
 end

data/lib/primate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Primate
-  VERSION = '0.6.1'
+  VERSION = "0.7.0"
 end

data/sig/primate.rbs

@@ -60,7 +60,6 @@ class RequestBag
   def []: (String key) -> String
   def try: (String key) -> String?
   def has?: (String key) -> bool
-  def parse: (untyped schema, ?bool coerce) -> untyped
   def to_h: () -> Hash[String, untyped]
   def size: () -> Integer
 end
@@ -99,8 +98,16 @@ module Session
 end
 
 module Response
+  def self.page: (?Hash[Symbol | String, untyped] props, ?Hash[Symbol | String, untyped] options) -> Hash[Symbol, untyped]
+  def self.abort: (Hash[Symbol, untyped] options) -> Hash[Symbol, untyped]
+  def self.binary: (Array[Integer] body, ?Hash[Symbol, untyped] options) -> Hash[Symbol, untyped]
+  def self.json: (untyped body, ?Hash[Symbol, untyped] options) -> Hash[Symbol, untyped]
+  def self.null: () -> Hash[Symbol, untyped]
+  def self.text: (String body, ?Hash[Symbol, untyped] options) -> Hash[Symbol, untyped]
+  def self.sse: (?Hash[Symbol, untyped] options) { (untyped) -> Proc? } -> Hash[Symbol, untyped]
+  def self.ws: (?Hash[Symbol, Proc] actions) -> Hash[Symbol, untyped]
   def self.view: (String name, ?Hash[String, untyped] props, ?Hash[String, untyped] options) -> Hash[Symbol, untyped]
-  def self.redirect: (String location, ?Hash[String, untyped] options) -> Hash[Symbol, untyped]
+  def self.redirect: (String location, ?Integer status) -> Hash[Symbol, untyped]
   def self.error: (?Hash[String, untyped] options) -> Hash[Symbol, untyped]
 end
 
@@ -121,44 +128,12 @@ module Route
   def self.call_route: (String method, Request request) -> untyped
 end
 
-module Pema
-  class ValidationError < StandardError
-  end
-
-  class Field
-    def parse: (untyped value, ?bool coerce) -> untyped
-  end
-
-  class StringType < Field
-    def parse: (untyped value, ?bool coerce) -> String
-  end
-
-  class BooleanType < Field
-    def parse: (untyped value, ?bool coerce) -> bool
-  end
-
-  class IntType < Field
-    def parse: (untyped value, ?bool coerce) -> Integer
-  end
-
-  class FloatType < Field
-    def parse: (untyped value, ?bool coerce) -> Float
-  end
-
-  class Schema
-    def initialize: (Hash[String, Field] fields) -> void
-    def parse: (Hash[String, untyped] data, ?bool coerce) -> Hash[String, untyped]
-  end
-
-  def self.string: () -> StringType
-  def self.boolean: () -> BooleanType
-  def self.int: () -> IntType
-  def self.float: () -> FloatType
-  def self.schema: (Hash[String, Field] fields) -> Schema
-end
-
 module PrimateInternal
   def self.set_session: (untyped session, untyped helpers) -> void
 end
 
-def type: (untyped value, untyped helpers) -> untyped
+class Object
+  private
+
+  def type: (untyped value, untyped helpers) -> untyped
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: primate-run
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Primate Team
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.26'
+- !ruby/object:Gem::Dependency
+  name: syntax_tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
 description: Provides Ruby support for building web applications with the Primate
   framework
 email:
@@ -61,7 +89,6 @@ extra_rdoc_files: []
 files:
 - lib/primate.rb
 - lib/primate/i18n.rb
-- lib/primate/pema.rb
 - lib/primate/readable.rb
 - lib/primate/request.rb
 - lib/primate/request_bag.rb
@@ -79,8 +106,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://primate.run
-  source_code_uri: https://github.com/primate-run/ruby
-  bug_tracker_uri: https://github.com/primate-run/ruby/issues
+  source_code_uri: https://repopack.com/project/primate
+  bug_tracker_uri: https://repopack.com/project/primate/tasks
 rdoc_options: []
 require_paths:
 - lib
@@ -88,14 +115,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.4.0
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Ruby route handlers for the Primate web framework
 test_files: []

data/lib/primate/pema.rb

@@ -1,134 +0,0 @@
-# frozen_string_literal: true
-
-module Pema
-  class ValidationError < StandardError; end
-
-  class Field
-    def parse(value, coerce = false)
-      raise NotImplementedError, 'Subclasses must implement parse'
-    end
-  end
-
-  class StringType < Field
-    def parse(value, coerce = false)
-      return value if value.is_a?(String)
-
-      if coerce
-        return value.to_s
-      end
-
-      raise ValidationError, "expected string, got #{value.class}"
-    end
-  end
-
-  class BooleanType < Field
-    def parse(value, coerce = false)
-      return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-
-      if coerce
-        case value
-        when String
-          return false if value.empty?
-          case value.downcase
-          when 'true', '1', 'yes', 'on'
-            return true
-          when 'false', '0', 'no', 'off'
-            return false
-          else
-            raise ValidationError, "cannot parse '#{value}' as boolean"
-          end
-        else
-          raise ValidationError, "cannot coerce #{value.class} to boolean"
-        end
-      end
-
-      raise ValidationError, "expected boolean, got #{value.class}"
-    end
-  end
-
-  class IntType < Field
-    def parse(value, coerce = false)
-      return value if value.is_a?(Integer)
-
-      if coerce
-        case value
-        when Float
-          return value.to_i
-        when String
-          return 0 if value.empty?
-          return Integer(value)
-        else
-          raise ValidationError, "cannot coerce #{value.class} to int"
-        end
-      end
-
-      raise ValidationError, "expected integer, got #{value.class}"
-    rescue ArgumentError
-      raise ValidationError, "cannot parse '#{value}' as integer"
-    end
-  end
-
-  class FloatType < Field
-    def parse(value, coerce = false)
-      return value if value.is_a?(Float)
-
-      if coerce
-        case value
-        when Integer
-          return value.to_f
-        when String
-          return 0.0 if value.empty?
-          return Float(value)
-        else
-          raise ValidationError, "cannot coerce #{value.class} to float"
-        end
-      end
-
-      raise ValidationError, "expected float, got #{value.class}"
-    rescue ArgumentError
-      raise ValidationError, "cannot parse '#{value}' as float"
-    end
-  end
-
-  def self.string
-    StringType.new
-  end
-
-  def self.boolean
-    BooleanType.new
-  end
-
-  def self.int
-    IntType.new
-  end
-
-  def self.float
-    FloatType.new
-  end
-
-  class Schema
-    def initialize(fields)
-      @fields = fields
-    end
-
-    def parse(data, coerce = false)
-      result = {}
-
-      @fields.each do |name, field|
-        value = data.key?(name) ? data[name] : ''
-
-        begin
-          result[name] = field.parse(value, coerce)
-        rescue ValidationError => e
-          raise ValidationError, "parsing failed for field '#{name}': #{e.message}"
-        end
-      end
-
-      result
-    end
-  end
-
-  def self.schema(fields)
-    Schema.new(fields)
-  end
-end