mirrors/zap
1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-21 07:34:08 +00:00
Code Activity

Merge pull request #89 from dweiller/zig-0.12.0

Browse source 
update for `@fieldParentPointer` RLS change
This commit is contained in:
Rene Schallner 2024-04-21 13:55:06 +02:00 • committed by GitHub
commit 0156c61012
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/endpoint/userweb.zig
View file

@ -54,7 +54,8 @@ fn userIdFromPath(self: *Self, path: []const u8) ?usize {
} }
fn getUser(e: *zap.Endpoint, r: zap.Request) void { fn getUser(e: *zap.Endpoint, r: zap.Request) void {
const self: Self = @fieldParentPtr("ep", e); const self: *Self = @fieldParentPtr("ep", e);
if (r.path) |path| { if (r.path) |path| {
// /users // /users
if (path.len == e.settings.path.len) { if (path.len == e.settings.path.len) {
@ -81,7 +82,7 @@ fn listUsers(self: *Self, r: zap.Request) void {
} }
fn postUser(e: *zap.Endpoint, r: zap.Request) void { fn postUser(e: *zap.Endpoint, r: zap.Request) void {
const self: Self = @fieldParentPtr("ep", e); const self: *Self = @fieldParentPtr("ep", e);
if (r.body) |body| { if (r.body) |body| {
const maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null; const maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null;
if (maybe_user) |u| { if (maybe_user) |u| {
@ -100,7 +101,7 @@ fn postUser(e: *zap.Endpoint, r: zap.Request) void {
} }
fn putUser(e: *zap.Endpoint, r: zap.Request) void { fn putUser(e: *zap.Endpoint, r: zap.Request) void {
const self: Self = @fieldParentPtr("ep", e); const self: *Self = @fieldParentPtr("ep", e);
if (r.path) |path| { if (r.path) |path| {
if (self.userIdFromPath(path)) |id| { if (self.userIdFromPath(path)) |id| {
if (self._users.get(id)) |_| { if (self._users.get(id)) |_| {
@ -126,7 +127,7 @@ fn putUser(e: *zap.Endpoint, r: zap.Request) void {
} }
fn deleteUser(e: *zap.Endpoint, r: zap.Request) void { fn deleteUser(e: *zap.Endpoint, r: zap.Request) void {
const self: Self = @fieldParentPtr("ep", e); const self: *Self = @fieldParentPtr("ep", e);
if (r.path) |path| { if (r.path) |path| {
if (self.userIdFromPath(path)) |id| { if (self.userIdFromPath(path)) |id| {
var jsonbuf: [128]u8 = undefined; var jsonbuf: [128]u8 = undefined;

6
examples/middleware/middleware.zig
View file

@ -72,7 +72,7 @@ const UserMiddleWare = struct {
pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool {
// this is how we would get our self pointer // this is how we would get our self pointer
const self: Self = @fieldParentPtr("handler", handler); const self: *Self = @fieldParentPtr("handler", handler);
_ = self; _ = self;
// do our work: fill in the user field of the context // do our work: fill in the user field of the context
@ -115,7 +115,7 @@ const SessionMiddleWare = struct {
// note that the first parameter is of type *Handler, not *Self !!! // note that the first parameter is of type *Handler, not *Self !!!
pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool {
// this is how we would get our self pointer // this is how we would get our self pointer
const self: Self = @fieldParentPtr("handler", handler); const self: *Self = @fieldParentPtr("handler", handler);
_ = self; _ = self;
context.session = Session{ context.session = Session{
@ -151,7 +151,7 @@ const HtmlMiddleWare = struct {
pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool {
// this is how we would get our self pointer // this is how we would get our self pointer
const self: Self = @fieldParentPtr("handler", handler); const self: *Self = @fieldParentPtr("handler", handler);
_ = self; _ = self;
std.debug.print("\n\nHtmlMiddleware: handling request with context: {any}\n\n", .{context}); std.debug.print("\n\nHtmlMiddleware: handling request with context: {any}\n\n", .{context});

6
examples/middleware_with_endpoint/middleware_with_endpoint.zig
View file

@ -60,7 +60,7 @@ const UserMiddleWare = struct {
pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool {
// this is how we would get our self pointer // this is how we would get our self pointer
const self: Self = @fieldParentPtr("handler", handler); const self: *Self = @fieldParentPtr("handler", handler);
_ = self; _ = self;
// do our work: fill in the user field of the context // do our work: fill in the user field of the context
@ -105,7 +105,7 @@ const SessionMiddleWare = struct {
// note that the first parameter is of type *Handler, not *Self !!! // note that the first parameter is of type *Handler, not *Self !!!
pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool {
// this is how we would get our self pointer // this is how we would get our self pointer
const self: Self = @fieldParentPtr("handler", handler); const self: *Self = @fieldParentPtr("handler", handler);
_ = self; _ = self;
context.session = Session{ context.session = Session{
@ -155,7 +155,7 @@ const HtmlEndpoint = struct {
} }
pub fn get(ep: *zap.Endpoint, r: zap.Request) void { pub fn get(ep: *zap.Endpoint, r: zap.Request) void {
const self: Self = @fieldParentPtr("ep", ep); const self: *Self = @fieldParentPtr("ep", ep);
_ = self; _ = self;
var buf: [1024]u8 = undefined; var buf: [1024]u8 = undefined;

2
src/middleware.zig
View file

@ -82,7 +82,7 @@ pub fn EndpointHandler(comptime HandlerType: anytype, comptime ContextType: anyt
/// If `breakOnFinish` is `true`, the handler will stop handing requests down the chain if /// If `breakOnFinish` is `true`, the handler will stop handing requests down the chain if
/// the endpoint processed the request. /// the endpoint processed the request.
pub fn onRequest(handler: *HandlerType, r: zap.Request, context: *ContextType) bool { pub fn onRequest(handler: *HandlerType, r: zap.Request, context: *ContextType) bool {
var self: Self = @fieldParentPtr("handler", handler); const self: *Self = @fieldParentPtr("handler", handler);
r.setUserContext(context); r.setUserContext(context);
self.endpoint.onRequest(r); self.endpoint.onRequest(r);