enquo-core 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62808ec8c685d873d37a00b3c422ab7bf7d824bc107f67c1062da909ad1cba9
-  data.tar.gz: 876d6ab8874c993a1a8b3df8a2ea328fa0f278435554514f861a40530ba1bfd3
+  metadata.gz: '019495fa89d0d738dcc9a233d4184e8d3cf58cdd9c27969e24ca613eb5a02a66'
+  data.tar.gz: a8ec7915b1a274cacf663914ee7bca2cbda0bcb92ba32dbd8dd45270069fef79
 SHA512:
-  metadata.gz: 3cbbaa974aeb7944c719ab12af59ca7bf9830aee31feeb865fe617f5ceebbbe9f5785286f2f878914353e759bd0d40e5cb5e32265f9be1df018d0b199b9ddda7
-  data.tar.gz: 04f5c68a2ea0be59a8b34999ca84a7cb2ee895ab546375a5a7a08a098aae78f70c2663598b85889784c4844f7dfb4637f9a22c81601903fc2d4a13c2dd68811a
+  metadata.gz: b10d02c6c60da77891c80b1d1d3992dcbf1eb3fa185632e302c72866f23edd92b1da0aa083012dc2a08c1c3d6e9e490239e6856074d8af3c89741061b18b8fd6
+  data.tar.gz: 413cb390002789a07e1a0a3b5d1785d662ad59c9d96f43a37be0ded27c0240f5b2b96b2685a8954528ab124400d4b7f68f611d1233c4970403c2a5bdcdce7c1b

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: ruby
 authors:
 - Matt Palmer