enquo-core 0.1.0.4.gdb566eb → 0.2.0.1.g790fccd

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b77707b3e001e2a8c1fac99b08351c08c98d01fa0633e1fefb7686ba221b75
-  data.tar.gz: fd733f530d3e1df259b4001e07bf6f83ed7b1aafdb309f4fa9dbfc63eee67304
+  metadata.gz: f94bb637e8f6a63b6091e5801e6f5aa2e3f2e6b8c2dafb530e6baaa228abed6c
+  data.tar.gz: b7bc5d5e9d7b1546533e7926454a7db743927321beddae88855a308596b3cb9c
 SHA512:
-  metadata.gz: 16e763c58c721d371137bc4457e2de0aaefde7923384a70e85c20fbd1f89c795ea63cf0319d1d2b5146416c5222467032e6831d56fa8cfda01a967230c3522fd
-  data.tar.gz: 5dbde0e083acce2f9c9bf6067120192c1eddd2fb868a739730ab7eb1963290fd85152626a94a37f92831adef8e7b38bc45d04fc9f19ae9e3781a28dbb113e0a1
+  metadata.gz: 5bc43e0ce7018896e7089371b3068d3b17d7ccd9a47cc784a76bb6f7fd367de70b287028fcc14a8ab0c4f9426d9ec9760522dc19e9ddd5204d0157f1ede6b3d3
+  data.tar.gz: e798b96decc361ec8695a4eb39768a5bcc2bfbc5711ec01969fd6d48ece567199ee0df6165ae2bd1ee3b27174144bee6888a1088ba763152bcc5825e0af09acb

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