primate-run 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e509379ff99ace8be7f98839eeee30c17b5be50079fbbbfd6b7adba31a8537
-  data.tar.gz: c329779406d4079f8dea9a40b29d1c13a14fa12879ef10b1e95bfc09e394e54f
+  metadata.gz: 0f83843c5b0fa350eec8aa6c38b3d2bd3277707d8c8dbeff6c4d1f1a655ae31c
+  data.tar.gz: 25bb52f15b1d6bb0afa45098d230c132a5c61a7da54b717d88bf7771ed8694b0
 SHA512:
-  metadata.gz: d12613cb5afa41f93ff3cdba54f56c686288bd0a99014fdb48ac127f22b2e219caea6c94d2e76d4f8ef98652176f8405843a89c9e96136b0d539f2a89299e180
-  data.tar.gz: 28e1aad880c9866b2ca0c03f19501ccb78b76c2e0774ac0fe54d4f0388656727048734030c147f6605754391305a33792e16e4ba626b7d74a25370d57021ff59
+  metadata.gz: 94a76367d2d7d059a4e1bd7403228d339900bb663843b94746549b66fe7ce46bc5671926da67348e6fa1ca407aecc231be9da15a1681d76ea072e6c3fb4a3825
+  data.tar.gz: e6dbcc74893720e392afd29f82b50ed8790e00b96e81de31862c54a70404f99e5830e0cde2e0501a5d80c8709c864b6080b1dfa63633fc28895395f396556275

data/lib/primate/request.rb

@@ -7,8 +7,6 @@ require_relative 'request_body'
 class Request
   attr_reader :url, :body, :path, :query, :headers, :cookies
 
-  # @param request [Object] JavaScript request object from the runtime
-  # @param helpers [Object] Helper functions from JavaScript runtime
   def initialize(request, helpers)
     @url = Primate::URL.new(request['url'])
     @body = RequestBody.new(request['body'], helpers)

data/lib/primate/request_body.rb

@@ -4,43 +4,38 @@ require 'json'
 require_relative 'readable'
 require_relative 'uploaded_file'
 
-# Wrapper for request body with type-specific methods
+class Multipart
+  attr_reader :form, :files
+
+  def initialize(form, files)
+    @form = form
+    @files = files
+  end
+end
+
 class RequestBody
-  # Initialize with JavaScript body object
-  #
-  # @param body [Object] JavaScript body object from runtime
-  # @param helpers [Object] Helper functions from JavaScript runtime
   def initialize(body, helpers)
     @body = body
     @helpers = helpers
   end
 
-  # Get body as JSON (parsed hash)
-  #
-  # @return [Hash] Parsed JSON data
   def json
-    JSON.parse(@body.json.to_s)
+    JSON.parse(@body.jsonSync.to_s)
   end
 
-  # Get body as plain text
-  #
-  # @return [String] Body as string
   def text
-    @body.text.to_s
+    @body.textSync.to_s
   end
 
-  # Get form as hash
-  #
-  # @return [Hash] Form data
   def form
-    JSON.parse(@body.form.to_s)
+    JSON.parse(@body.formSync.to_s)
   end
 
-  def files
-    files = @body.files
-
-    Array.new(files[:length].to_i) do |i|
-      f = files[i]
+  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,
@@ -49,10 +44,10 @@ class RequestBody
         bytes: f['bytes']
       )
     end
+    Multipart.new(form, files)
   end
 
-  def binary
-    binary = @body.binary
-    Primate::Readable.new(binary['buffer'], binary['mime'].to_s)
+  def blob
+    Primate::Readable.new(@body.blobSync, @body.blobTypeSync.to_s)
   end
 end

data/lib/primate/response.rb

@@ -16,8 +16,10 @@ module Response
   # @param location [String] URL to redirect to
   # @param options [Hash] Redirect options (status code, etc.)
   # @return [Hash] Response object for the Primate framework
-  def self.redirect(location, options = {})
-    { __PRMT__: 'redirect', location: location, options: options }
+  def self.redirect(location, status = nil)
+    result = { __PRMT__: 'redirect', location: location }
+    result[:status] = status if status
+    result
   end
 
   # Create an error response

data/lib/primate/route.rb

@@ -10,28 +10,25 @@ module Route
   @current_scope = "__global__"
 
   class << self
-    # set the active scope for subsequent handler registrations
     def scope(id)
       @current_scope = id.to_s
       @registry[@current_scope]
     end
 
-    # clear routes for a specific scope (or the current scope if none given)
     def clear(id = nil)
       target = (id || @current_scope).to_s
       @registry.delete(target)
       @registry[target] = {}
     end
 
-    # return the verb->handler map for a scope (read-only use)
     def registry(id = nil)
       @registry[(id || @current_scope).to_s]
     end
 
     %w[GET POST PUT PATCH DELETE HEAD OPTIONS CONNECT TRACE].each do |verb|
-      define_method(verb.downcase) do |&block|
+      define_method(verb.downcase) do |content_type: nil, &block|
         raise ArgumentError, "block required" unless block
-        registry[verb] = block
+        registry[verb] = { handler: block, content_type: content_type }
       end
     end
 
@@ -47,12 +44,12 @@ module Route
       set_session(session, helpers)
       set_i18n(i18n)
 
-      request = Request.new(js_req, helpers)
       verb_up = verb.to_s.upcase
-      handler = @registry.dig(scope_id.to_s, verb_up)
-      return Response.error(status: 404) unless handler
+      entry = @registry.dig(scope_id.to_s, verb_up)
+      return Response.error(status: 404) unless entry
 
-      handler.call(request)
+      request = Request.new(js_req, helpers)
+      entry[:handler].call(request)
     end
   end
 end

data/lib/primate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: primate-run
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Primate Team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="