dotenvx 4.0.4 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 064bf1a8af2ec748d2b4ee03c0dae6b81dd87b7816b090340f6f3b14634c3d42
-  data.tar.gz: 14d620741ee83316f1f94201815adf6b23af7ce97706a6cc479991d383ed4678
+  metadata.gz: a226fa6cca5ffa31823ef4d670b2860f174260de75654902121e49438fe0ec50
+  data.tar.gz: 592d8ddbaf65cd2074078cb4cc4e09d885b7cb4c503dbd1ff42ec6ee0ce33dcd
 SHA512:
-  metadata.gz: 92653db2d9c3f96a6759e4593781bc62dafd9a4c02dab83514e9d8c24f108dcf4df846ad315fd70d4566d02e16a215f8119578705ce3ecb25a070fdc65c378a4
-  data.tar.gz: 022b6ed8bc4aca5cd7223511da36cfed75f7e9738430ba7f00cce84b7f8ef0f62b22f2d3da78d81a7eb7b3bc4a1bb12d3118786cb031fadac37fef7a9e8a35eb
+  metadata.gz: 9851c708289150555f197a20dd4a9a76805968f80138d8861db16d9132e85c6128755bbaa0b4e2adbe55b81b25a159430f6f152a21ab45e7c7c89ba7976cba44
+  data.tar.gz: 1a899dfc7ef979033f616a2958b1ee3d8a22d98b65bcd6ce2070951b2b1f14868996a7fa458149b4d547ef75f309c6b0479531867cd00c9e4e38ce2259473efb

data/CHANGELOG.md

@@ -2,7 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.4...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.5...main)
+
+## [4.0.5](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.4...v4.0.5)
+
+- Continue after parse and decryption errors by default, with strict and
+  error-code ignore options for callers that need them.
 
 ## [4.0.4](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.3...v4.0.4)
 

data/Cargo.lock

@@ -208,9 +208,9 @@ dependencies = [
 
 [[package]]
 name = "dotenvx-primitives"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db07437b4c9f5aa5519906e629b40239604fd8e0aa1a2ccaf51e82614ebd4e7"
+checksum = "3437345180bc51f1355f184583a394ce06ca94ddf4f37859f6e6a42cfa29db2c"
 dependencies = [
  "base64",
  "ecies",
@@ -222,7 +222,7 @@ dependencies = [
 
 [[package]]
 name = "dotenvx_native"
-version = "4.0.4"
+version = "4.0.6"
 dependencies = [
  "dotenvx-primitives",
  "magnus",

data/ext/dotenvx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dotenvx_native"
-version = "4.0.4"
+version = "4.0.6"
 edition = "2021"
 rust-version = "1.83"
 publish = false
@@ -10,7 +10,7 @@ name = "dotenvx_native"
 crate-type = ["cdylib"]
 
 [dependencies]
-dotenvx-primitives = "=2.2.0"
+dotenvx-primitives = "=3.0.0"
 magnus = "0.8"
 rb-sys = { version = "0.9.128", default-features = false, features = ["stable-api-compiled-force"] }
 serde = { version = "1", features = ["derive"] }

data/ext/dotenvx/src/lib.rs

@@ -1,38 +1,28 @@
-use dotenvx_primitives::{keyring, parse, KeyringOptions, ParseOptions, ParseResult, Value};
+use dotenvx_primitives::{parse, ParseOptions, ParseResult};
 use magnus::{function, prelude::*, Error, Ruby};
 use serde::Deserialize;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
 type StringPairs = Vec<(String, String)>;
+type ErrorPairs = Vec<(String, String)>;
 
 fn runtime_error(message: impl Into<String>) -> Error {
     let ruby = Ruby::get().expect("Ruby VM is not available");
     Error::new(ruby.exception_runtime_error(), message.into())
 }
 
-fn scalar_values(values: HashMap<String, Value>) -> StringPairs {
-    values
-        .into_iter()
-        .filter_map(|(key, value)| match value {
-            Value::Scalar(value) => Some((key, value)),
-            Value::Array(_) => None,
-        })
-        .collect()
-}
-
-fn parse_result(result: ParseResult) -> Result<(StringPairs, StringPairs), Error> {
-    if !result.errors.is_empty() {
-        let message = result
-            .errors
-            .iter()
-            .map(ToString::to_string)
-            .collect::<Vec<_>>()
-            .join("\n");
-        return Err(runtime_error(message));
-    }
-
-    Ok((scalar_values(result.parsed), scalar_values(result.injected)))
+fn parse_result(result: ParseResult) -> (StringPairs, StringPairs, ErrorPairs) {
+    let errors = result
+        .errors
+        .iter()
+        .map(|error| (error.code().to_owned(), error.to_string()))
+        .collect();
+    (
+        result.parsed.into_iter().collect(),
+        result.injected.into_iter().collect(),
+        errors,
+    )
 }
 
 #[derive(Deserialize)]
@@ -43,26 +33,19 @@ struct ParseInput {
     key_files: Vec<String>,
 }
 
-fn parse_dotenv(input_json: String) -> Result<(StringPairs, StringPairs), Error> {
+fn parse_dotenv(input_json: String) -> Result<(StringPairs, StringPairs, ErrorPairs), Error> {
     let input = serde_json::from_str::<ParseInput>(&input_json)
         .map_err(|error| runtime_error(error.to_string()))?;
     let process_env = input.process_env;
-    let ring = keyring(&KeyringOptions {
-        process_env: process_env.clone(),
-        key_files: input.key_files.into_iter().map(PathBuf::from).collect(),
-        ..Default::default()
-    })
-    .map_err(|error| runtime_error(error.to_string()))?;
-
-    parse_result(parse(
+    Ok(parse_result(parse(
         &input.source,
         &ParseOptions {
             process_env,
             overload: input.overwrite,
-            ring,
+            key_files: input.key_files.into_iter().map(PathBuf::from).collect(),
             ..Default::default()
         },
-    ))
+    )))
 }
 
 #[magnus::init]

data/lib/dotenvx/version.rb

@@ -1,3 +1,3 @@
 module Dotenvx
-  VERSION = "4.0.4"
+  VERSION = "4.0.6"
 end

data/lib/dotenvx.rb

@@ -13,14 +13,24 @@ module Dotenvx
     end
   end
 
+  class ParseError < RuntimeError
+    attr_reader :code
+
+    def initialize(code, message)
+      @code = code
+      super(message)
+    end
+  end
+
   class << self
     attr_accessor :instrumenter
 
-    def load(*filenames, overwrite: false, ignore: true)
+    def load(*filenames, overwrite: false, ignore: true, strict: false)
       env, injected_keys, loaded_paths = parse_files(
         *filenames,
         overwrite: overwrite,
-        ignore: ignore
+        ignore: ignore,
+        strict: strict
       )
       changed = update(env, overwrite: overwrite)
       log_injected(injected_keys, loaded_paths)
@@ -28,7 +38,7 @@ module Dotenvx
     end
 
     def load!(*filenames)
-      load(*filenames, ignore: false)
+      load(*filenames, ignore: false, strict: true)
     end
 
     def overwrite(*filenames)
@@ -37,12 +47,17 @@ module Dotenvx
     alias overload overwrite
 
     def overwrite!(*filenames)
-      load(*filenames, overwrite: true, ignore: false)
+      load(*filenames, overwrite: true, ignore: false, strict: true)
     end
     alias overload! overwrite!
 
-    def parse(*filenames, overwrite: false, ignore: true)
-      parse_files(*filenames, overwrite: overwrite, ignore: ignore).first
+    def parse(*filenames, overwrite: false, ignore: true, strict: false)
+      parse_files(
+        *filenames,
+        overwrite: overwrite,
+        ignore: ignore,
+        strict: strict
+      ).first
     end
 
     def update(env = {}, overwrite: false)
@@ -72,7 +87,7 @@ module Dotenvx
 
     private
 
-    def parse_files(*filenames, overwrite: false, ignore: true)
+    def parse_files(*filenames, overwrite: false, ignore: true, strict: false)
       filenames = [".env"] if filenames.empty?
       filenames = filenames.flatten.reverse if overwrite
 
@@ -84,16 +99,17 @@ module Dotenvx
         begin
           source = File.binread(path).sub(/\A\xEF\xBB\xBF/, "").force_encoding(Encoding::UTF_8)
         rescue Errno::ENOENT, Errno::EISDIR
-          raise unless ignore
+          raise unless ignore_missing?(ignore)
           next accumulator
         end
 
-        parsed, injected = Native.parse_dotenv(JSON.generate(
+        parsed, injected, errors = Native.parse_dotenv(JSON.generate(
           source: source,
           process_env: process_env,
           overwrite: overwrite == true,
           key_files: key_files(path)
         ))
+        handle_errors(errors, ignore: ignore, strict: strict)
         parsed = parsed.to_h
         injected.each { |key, _value| injected_keys[key] = true }
         loaded_paths << path
@@ -105,6 +121,21 @@ module Dotenvx
       [values, injected_keys.keys, loaded_paths]
     end
 
+    def handle_errors(errors, ignore:, strict:)
+      ignored_codes = Array(ignore).grep(String)
+      errors.each do |code, message|
+        next if ignored_codes.include?(code)
+
+        raise ParseError.new(code, message) if strict
+
+        warn "☠ #{message}"
+      end
+    end
+
+    def ignore_missing?(ignore)
+      ignore == true || Array(ignore).map(&:to_s).include?("MISSING_ENV_FILE")
+    end
+
     def log_injected(injected_keys, loaded_paths)
       message = "⟐ injected env (#{injected_keys.length})"
       unless loaded_paths.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenvx
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.6
 platform: ruby
 authors:
 - motdotla