enquo-core 0.1.0.4.gdb566eb-x86_64-darwin → 0.2.0.1.g790fccd-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd244c6b1f4cf98bc49a74adb259fd7c4480b17e65afb400dcca1e7dd91dedc
-  data.tar.gz: d1621e88bbf181ebce5ff20acd9dc7d7ff4b738b4bdf8504f5ad2e45666e7530
+  metadata.gz: c98db99fd06986bd5b25b5620b8d75bbaf4471632719e6766eff24cbb46f321f
+  data.tar.gz: 61b20475a89d0b7d7ca289d63a67705a03b0b61e5117bd642657c72221929079
 SHA512:
-  metadata.gz: 3a674cc1d06589a7f365836f40520d798af157192ca77b461bb1cc2218f3589283e1e6ecb14edf8fcbc9bb415de087d72934687a1c8d572994157def83ea75d4
-  data.tar.gz: 7ecbb32cbf4c3d9f855c4d841375bb34e29ca0aa054de8edfcd89c0efdc50c22e5d12f03ee66ab0e63ac98c686ef952fa83443e16c5d70e0e5c074d1e01e7632
+  metadata.gz: b734f20b173ed4b59b4b427be3dd98be98de44e05d6ce1f871ba8c465194db2f5e406f1beca38a64574bca36bb47faa2dafec9577661aeee390eeac45e6ff648
+  data.tar.gz: fe8673c96b33b41e444fd41f94661f6b13e081850a7c078eae4c917819ddca02928ba330c902f92730a67ea1692907aa1ccfc2540fba6f9bbc825115eaac7685

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.1.0.4.gdb566eb
+  version: 0.2.0.1.g790fccd
 platform: x86_64-darwin
 authors:
 - Matt Palmer