enquo-core 0.2.0-x86_64-darwin → 0.3.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b704e5878915007d8c50fa7a0f3a52696c9accf027fef84546e8d8dedb7a9f
-  data.tar.gz: 5000eadc34995fa302bc84c063cac20faecd293c68578cae04d3142fc783a5b6
+  metadata.gz: b14b3aa8febd145bcb377577a1be48769b976e8650ae0f1fa42a9c02bebc556f
+  data.tar.gz: 1c71645d041b29e11d8c429e0816a6ea613271b33094912d0064f6ee8cd7f94d
 SHA512:
-  metadata.gz: 78ce09cca4014a4c56aa1e830e4d8774072c6953f26e3776428733f35b4928ad6661d716d27ede1fcb6664e6075f0c8795ae100318984433d1d25a381d2b6efd
-  data.tar.gz: 35843d92695c37d1c9a4aa1cebc70cd88a217a512360af716482ae7f99f51d8cce8378165b620dccf5f8e84bfe625e397f2a2531b85280144ea866c09b9d106c
+  metadata.gz: 876367b98ea75a87576b9d46f37d7c5b3858907628ab625b836545fb128b0b4464441c1eab9b493c93050f985dabdf6fbdf9d38dfee206ab4f929bde8160bea1
+  data.tar.gz: cbee53e5fa6590bc092650326595a7f1739e10b4f9419fc6824a96f7ff15f1eee43939d22e4ede43ff22f0a18c32751b3d017e51590f073816756bcd6e8e12ce

data/ext/enquo/src/lib.rs

@@ -2,7 +2,7 @@
 extern crate rutie;
 
 use enquo_core::{Field, Root, I64};
-use rutie::{Boolean, Class, Integer, Module, Object, RString, VerifiedObject, VM};
+use rutie::{Class, Integer, Module, Object, RString, Symbol, VerifiedObject, VM};
 
 class!(EnquoRoot);
 class!(EnquoRootKeyStatic);
@@ -81,18 +81,24 @@ impl VerifiedObject for EnquoRootKeyStatic {
 methods!(
     EnquoField,
     rbself,
-    fn enquo_field_encrypt_i64(value: Integer, context: RString, unsafe_parts: Boolean) -> RString {
+    fn enquo_field_encrypt_i64(value: Integer, context: RString, mode: Symbol) -> RString {
         let i = value.unwrap().to_i64();
         let field = rbself.get_data(&*FIELD_WRAPPER);
+        let r_mode = mode.unwrap();
+        let s_mode = r_mode.to_str();
 
-        let res = maybe_raise(
-            if unsafe_parts.unwrap().to_bool() {
+        let mut res = maybe_raise(
+            if s_mode == "unsafe" {
                 I64::new_with_unsafe_parts(i, &context.unwrap().to_vec_u8_unchecked(), field)
             } else {
                 I64::new(i, &context.unwrap().to_vec_u8_unchecked(), field)
             },
             "Failed to create encrypted i64",
         );
+        if s_mode == "no_query" {
+            res.drop_ore_ciphertext();
+        }
+
         RString::new_utf8(&serde_json::to_string(&res).unwrap())
     },
     fn enquo_field_decrypt_i64(ciphertext: RString, context: RString) -> Integer {

data/lib/enquo/field.rb

@@ -4,7 +4,7 @@ module Enquo
 			raise RuntimeError, "Enquo::Field cannot be instantiated directly; use Enquo::Crypto#field instead"
 		end
 
-		def encrypt_i64(i, ctx, safety: nil)
+		def encrypt_i64(i, ctx, safety: true, no_query: false)
 			unless i.is_a?(Integer)
 				raise ArgumentError, "Enquo::Field#encrypt_i64 can only encrypt integers"
 			end
@@ -17,7 +17,7 @@ module Enquo
 				raise ArgumentError, "Encryption context must be a string (got a #{ctx.class})"
 			end
 
-			_encrypt_i64(i, ctx, safety == :unsafe)
+			_encrypt_i64(i, ctx, no_query ? :no_query : safety == :unsafe ? :unsafe : :default)
 		end
 
 		def decrypt_i64(data, ctx)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enquo-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: x86_64-darwin
 authors:
 - Matt Palmer