Skip to content

Commit

Permalink
chore: rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Hanaasagi committed Jun 24, 2023
1 parent d9af566 commit 8364bcb
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
8 changes: 1 addition & 7 deletions src/lib.zig
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,10 @@ pub fn load(allocator: std.mem.Allocator, comptime options: Options) !void {

/// Loads the `.env` file from the given path.
pub fn loadFrom(allocator: std.mem.Allocator, path: []const u8, comptime options: Options) !void {
var f = try std.fs.cwd().openFile(path, .{});
defer f.close();

var br = std.io.bufferedReader(f.reader());
var reader = br.reader();

var loader = Loader(options).init(allocator);
defer loader.deinit();

try loader.load(reader);
try loader.loadFromFile(path);
}

test "test load real file" {
Expand Down
20 changes: 15 additions & 5 deletions src/loader.zig
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,17 @@ pub fn Loader(comptime options: Options) type {
return &self.parser.ctx;
}

pub fn load(self: *Self, reader: anytype) !void {
pub fn loadFromFile(self: *Self, path: []const u8) !void {
var f = try std.fs.cwd().openFile(path, .{});
defer f.close();

var br = std.io.bufferedReader(f.reader());
var reader = br.reader();

return try self.loadFromStream(reader);
}

pub fn loadFromStream(self: *Self, reader: anytype) !void {
while (true) {
// read a logical line.
const line = try self.readLine(reader);
Expand Down Expand Up @@ -239,7 +249,7 @@ test "test load" {

var loader = Loader(.{}).init(allocator);
defer loader.deinit();
try loader.load(reader);
try loader.loadFromStream(reader);

try testing.expectEqualStrings(loader.envs().get("KEY0").?.?, "0");
try testing.expectEqualStrings(loader.envs().get("KEY1").?.?, "1");
Expand Down Expand Up @@ -268,7 +278,7 @@ test "test multiline" {

var loader = Loader(.{}).init(allocator);
defer loader.deinit();
try loader.load(reader);
try loader.loadFromStream(reader);

try testing.expectEqualStrings(loader.envs().get("C").?.?, "F\nS");
}
Expand All @@ -284,7 +294,7 @@ test "test not override" {

var loader = Loader(.{ .override = false }).init(allocator);
defer loader.deinit();
try loader.load(reader);
try loader.loadFromStream(reader);

const r = std.os.getenv("HOME");
try testing.expect(!std.mem.eql(u8, r.?, "/home/nayuta"));
Expand All @@ -301,7 +311,7 @@ test "test override" {

var loader = Loader(.{ .override = true }).init(allocator);
defer loader.deinit();
try loader.load(reader);
try loader.loadFromStream(reader);

const r = std.os.getenv("HOME");
try testing.expect(std.mem.eql(u8, r.?, "/home/nayuta"));
Expand Down

0 comments on commit 8364bcb

Please sign in to comment.