vacman_controller 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70e83106c486e3e2055b0a10215f1895fceb4e2d
-  data.tar.gz: 3c57b77c49ac9cbc9b8baeaf0cc350d902abe489
+  metadata.gz: 718f0e9098056c9546ccd49309c2aef13b8fd1da
+  data.tar.gz: a10a4e19da9752526d224b01440506c3e93244f9
 SHA512:
-  metadata.gz: 28a07e0dcce49bf04fd089be86472e35fc2ab5e5ed7fc01f724e6ded8173bde1edbd253d3890b86a2d578e430265b002b5693ad42455af26a25262c7ec7dd67e
-  data.tar.gz: 7ee6a428246bcee1c417cae5cf0c9ddc5180813efab448b793d7444813b9c737eef6913c0ab4a19ec77b32c5e0e9192d1c146c3dff7e7fbdd8a2305ec3b6a08c
+  metadata.gz: 7f54254895c1d350a44bcbbb2dfd327f20429e51b1bc3cec0b7ae7eadf5e8c9e0c2775bc8f6c5f0c4d1f9b89fea7d53bf6b4737a52e53293efe46a5d8093dc09
+  data.tar.gz: eb7ebc7004676464142abd4220193f1e05de741925918a418c40ff76fb8d53f45a30a84a48f10c46fa88f50b4a098faeecf20658f9421143f6d0c6d26fc9737e

data/ext/vacman_controller/vacman_controller.c

@@ -18,12 +18,33 @@ static void vacman_raise_error(const char* method, int error_code) {
 /*
  * convert a ruby hash to TDigipassBlob structure
  */
+static VALUE rbhash_get_key(VALUE token, const char *property, int type) {
+  VALUE ret = rb_hash_aref(token, rb_str_new2(property));
+
+  if (ret == Qnil) {
+    rb_raise(e_vacmanerror, "invalid token object given: %s property is nil", property);
+    return Qnil;
+  }
+
+  if (!RB_TYPE_P(ret, type)) {
+    rb_raise(e_vacmanerror, "invalid token object given: %s property is not of the correct type", property);
+    return Qnil;
+  }
+
+  return ret;
+}
+
 static void rbhash_to_digipass(VALUE token, TDigipassBlob* dpdata) {
-  VALUE blob = rb_hash_aref(token, rb_str_new2("blob"));
-  VALUE serial = rb_hash_aref(token, rb_str_new2("serial"));
-  VALUE app_name = rb_hash_aref(token, rb_str_new2("app_name"));
-  VALUE flag1 = rb_hash_aref(token, rb_str_new2("flags1"));
-  VALUE flag2 = rb_hash_aref(token, rb_str_new2("flags2"));
+  if (!RB_TYPE_P(token, T_HASH)) {
+    rb_raise(e_vacmanerror, "invalid token object given, requires an hash");
+    return;
+  }
+
+  VALUE blob     = rbhash_get_key(token, "blob",     T_STRING);
+  VALUE serial   = rbhash_get_key(token, "serial",   T_STRING);
+  VALUE app_name = rbhash_get_key(token, "app_name", T_STRING);
+  VALUE flag1    = rbhash_get_key(token, "flags1",   T_FIXNUM);
+  VALUE flag2    = rbhash_get_key(token, "flags2",   T_FIXNUM);
 
   memset(dpdata, 0, sizeof(*dpdata));
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vacman_controller
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Marcus Lankenau