msr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05a55f89cc5ba507959b75913957939f283e039
-  data.tar.gz: aef2815e7192bade10ed798c073b63049cf52587
+  metadata.gz: db0608761faf290f7fb9eceac6be19f584a8b050
+  data.tar.gz: 91a207db5a02beba3ebfa044e5bc10a2e22f34f8
 SHA512:
-  metadata.gz: b6e4beea042e4fba1ff9d87df4b8ce99175990b1e77f48761c9652089ae3d0a9a353e9aee1a57dd44129897bec799bb36ca66dbb5abfebc976449bf5b4f31600
-  data.tar.gz: 3b9c9e7f3049c7ff5a44d0499ad5c56eba6f0344f4e4a1d37db6937c9381abb25b5a68b763ef611e817b72c867c62dd5e30fb940019cbc1281d38d080f38a726
+  metadata.gz: f834b5ee6d3c3771b7d3214676b1d3e27caf3b2d66cd40a3a927d8485092eac8c5743dbc58dca2a2e5619555a8930f5aba97ae4f7917878ca907e3becda38b0a
+  data.tar.gz: 3be025af516e630802c1916e2a40504bc4d95702e6cb6f8fbb9899edf7afa545d19603e820267ac54196732dc45a598b4ef07807606a7857fb89241f4fb994a0

data/ext/msr/msr206.c

@@ -8,10 +8,11 @@ static VALUE initialize(VALUE self, VALUE rb_string);
 static VALUE comm_test(VALUE self);
 static VALUE sensor_test(VALUE self);
 static VALUE ram_test(VALUE self);
+static VALUE reset(VALUE self);
 static VALUE get_coercivity(VALUE self);
 static VALUE set_coercivity(VALUE self, VALUE co_sym);
 static VALUE set_bpi(VALUE self, VALUE bpi);
-static VALUE set_bpc(VALUE self, VALUE bpc);
+static VALUE set_bpc(VALUE self, VALUE bpc1, VALUE bpc2, VALUE bpc3);
 static VALUE set_led(VALUE self, VALUE led_sym);
 static VALUE raw_read(VALUE self);
 static VALUE iso_read(VALUE self);
@@ -26,10 +27,11 @@ void Init_msr_msr206()
 	rb_define_method(cMSR_MSR206, "comm_test!", comm_test, 0);
 	rb_define_method(cMSR_MSR206, "sensor_test!", sensor_test, 0);
 	rb_define_method(cMSR_MSR206, "ram_test!", ram_test, 0);
+	rb_define_method(cMSR_MSR206, "reset!", reset, 0);
 	rb_define_method(cMSR_MSR206, "coercivity", get_coercivity, 0);
 	rb_define_method(cMSR_MSR206, "coercivity=", set_coercivity, 1);
 	rb_define_method(cMSR_MSR206, "bpi=", set_bpi, 1);
-	rb_define_method(cMSR_MSR206, "bpc=", set_bpc, 1);
+	rb_define_method(cMSR_MSR206, "bpc=", set_bpc, 3);
 	rb_define_method(cMSR_MSR206, "led=", set_led, 1);
 	rb_define_method(cMSR_MSR206, "raw_read", raw_read, 0);
 	rb_define_method(cMSR_MSR206, "iso_read", iso_read, 0);
@@ -52,7 +54,7 @@ static void deallocate_206_ctx(msr206_ctx_t *ctx)
 		msr_serial_close(ctx->fd);
 	}
 
-	free(ctx);
+	xfree(ctx);
 }
 
 static VALUE initialize(VALUE self, VALUE rb_path)
@@ -83,17 +85,67 @@ static VALUE initialize(VALUE self, VALUE rb_path)
 
 static VALUE comm_test(VALUE self)
 {
-	return Qnil;
+	VALUE pass = ID2SYM(rb_intern("pass"));
+	VALUE fail = ID2SYM(rb_intern("fail"));
+	msr206_ctx_t *ctx;
+	int ret;
+
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	ret = msr_commtest(ctx->fd);
+
+	if (ret != LIBMSR_ERR_OK) {
+		return fail;
+	}
+
+	return pass;
 }
 
 static VALUE sensor_test(VALUE self)
 {
-	return Qnil;
+	VALUE pass = ID2SYM(rb_intern("pass"));
+	VALUE fail = ID2SYM(rb_intern("fail"));
+	msr206_ctx_t *ctx;
+	int ret;
+
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	ret = msr_sensor_test(ctx->fd);
+
+	if (ret != LIBMSR_ERR_OK) {
+		return fail;
+	}
+
+	return pass;
 }
 
 static VALUE ram_test(VALUE self)
 {
-	return Qnil;
+	VALUE pass = ID2SYM(rb_intern("pass"));
+	VALUE fail = ID2SYM(rb_intern("fail"));
+	msr206_ctx_t *ctx;
+	int ret;
+
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	ret = msr_ram_test(ctx->fd);
+
+	if (ret != LIBMSR_ERR_OK) {
+		return fail;
+	}
+
+	return pass;
+}
+
+static VALUE reset(VALUE self)
+{
+	msr206_ctx_t *ctx;
+
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	msr_reset(ctx->fd);
+
+	return self;
 }
 
 static VALUE get_coercivity(VALUE self)
@@ -147,12 +199,46 @@ static VALUE set_coercivity(VALUE self, VALUE co_sym)
 
 static VALUE set_bpi(VALUE self, VALUE bpi)
 {
-	return Qnil;
+	uint8_t bpi_tk2;
+	msr206_ctx_t *ctx;
+	int ret;
+
+	Check_Type(bpi, T_FIXNUM);
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	bpi_tk2 = NUM2CHR(bpi);
+
+	ret = msr_set_bpi(ctx->fd, bpi_tk2);
+
+	if (ret != LIBMSR_ERR_OK) {
+		rb_raise(rb_eRuntimeError, "Couldn't change bpi (%d)", ret);
+	}
+
+	return self;
 }
 
-static VALUE set_bpc(VALUE self, VALUE bpc)
+static VALUE set_bpc(VALUE self, VALUE bpc1, VALUE bpc2, VALUE bpc3)
 {
-	return Qnil;
+	uint8_t bpc_tk1, bpc_tk2, bpc_tk3;
+	msr206_ctx_t *ctx;
+	int ret;
+
+	Check_Type(bpc1, T_FIXNUM);
+	Check_Type(bpc2, T_FIXNUM);
+	Check_Type(bpc3, T_FIXNUM);
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	bpc_tk1 = NUM2CHR(bpc1);
+	bpc_tk2 = NUM2CHR(bpc2);
+	bpc_tk3 = NUM2CHR(bpc3);
+
+	ret = msr_set_bpc(ctx->fd, bpc_tk1, bpc_tk2, bpc_tk3);
+
+	if (ret != LIBMSR_ERR_OK) {
+		rb_raise(rb_eRuntimeError, "Couldn't change bpc (%d)", ret);
+	}
+
+	return self;
 }
 
 static VALUE set_led(VALUE self, VALUE led_sym)
@@ -242,10 +328,46 @@ static VALUE iso_read(VALUE self)
 
 static VALUE raw_write(VALUE self, VALUE tks_obj)
 {
-	return Qnil;
+	msr206_ctx_t *ctx;
+	msr_tracks_t tks = {0};
+	int ret;
+
+	if (CLASS_OF(tks_obj) != c_MSR_Tracks) {
+		rb_raise(rb_eArgError, "expected tracks object");
+	}
+
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	msr_unwrap_tracks(tks_obj, &tks);
+
+	ret = msr_raw_write(ctx->fd, &tks);
+
+	if (ret != LIBMSR_ERR_OK) {
+		rb_raise(rb_eRuntimeError, "Device write failed (%d)", ret);
+	}
+
+	return self;
 }
 
 static VALUE iso_write(VALUE self, VALUE tks_obj)
 {
-	return Qnil;
+	msr206_ctx_t *ctx;
+	msr_tracks_t tks = {0};
+	int ret;
+
+	if (CLASS_OF(tks_obj) != c_MSR_Tracks) {
+		rb_raise(rb_eArgError, "expected tracks object");
+	}
+
+	Data_Get_Struct(self, msr206_ctx_t, ctx);
+
+	msr_unwrap_tracks(tks_obj, &tks);
+
+	ret = msr_iso_write(ctx->fd, &tks);
+
+	if (ret != LIBMSR_ERR_OK) {
+		rb_raise(rb_eRuntimeError, "Device write failed (%d)", ret);
+	}
+
+	return self;
 }

data/ext/msr/shim.c

@@ -0,0 +1,60 @@
+#include "msr.h"
+
+/*
+	A convenience function for instantiating a new MSR::Track in C.
+*/
+VALUE msr_track_new(msr_track_t tk)
+{
+	VALUE obj = rb_obj_alloc(c_MSR_Track);
+
+	VALUE tk_data_ary = rb_ary_new();
+
+	for (int i = 0; i < tk.msr_tk_len; i++) {
+		rb_ary_push(tk_data_ary, INT2NUM(tk.msr_tk_data[i]));
+	}
+
+	return msr_track_initialize(obj, tk_data_ary);
+}
+
+/*
+	A convenience function for instantiating a new MSR::Tracks in C.
+*/
+VALUE msr_tracks_new(msr_tracks_t tks)
+{
+	VALUE obj = rb_obj_alloc(c_MSR_Tracks);
+	VALUE tk1_obj = msr_track_new(tks.msr_tracks[0]);
+	VALUE tk2_obj = msr_track_new(tks.msr_tracks[1]);
+	VALUE tk3_obj = msr_track_new(tks.msr_tracks[2]);
+
+	return msr_tracks_initialize(obj, tk1_obj, tk2_obj, tk3_obj);
+}
+
+/*
+	A convenience function for unwrapping an MSR::Track instance.
+*/
+void msr_unwrap_track(VALUE tk_obj, msr_track_t *tk)
+{
+	VALUE tk_data_ary = rb_funcall(tk_obj, rb_intern("data"), 0);
+	VALUE tk_data_len = rb_funcall(tk_obj, rb_intern("length"), 0);
+	uint8_t len = (uint8_t) NUM2CHR(tk_data_len);
+
+	tk->msr_tk_len = len;
+
+	for (int i = 0; i < len; i++) {
+		tk->msr_tk_data[i] = (uint8_t) NUM2CHR(rb_ary_entry(tk_data_ary, i));
+	}
+}
+
+/*
+	A convenience function for unwrapping an MSR::Tracks instance.
+*/
+void msr_unwrap_tracks(VALUE tks_obj, msr_tracks_t *tks)
+{
+	VALUE tk1_obj = rb_funcall(tks_obj, rb_intern("track1"), 0);
+	VALUE tk2_obj = rb_funcall(tks_obj, rb_intern("track2"), 0);
+	VALUE tk3_obj = rb_funcall(tks_obj, rb_intern("track3"), 0);
+
+	msr_unwrap_track(tk1_obj, &(tks->msr_tracks[0]));
+	msr_unwrap_track(tk2_obj, &(tks->msr_tracks[1]));
+	msr_unwrap_track(tk3_obj, &(tks->msr_tracks[2]));
+}

data/ext/msr/track.c

@@ -1,6 +1,5 @@
 #include "msr.h"
 
-static VALUE initialize(VALUE self, VALUE data);
 static VALUE msr_track_data(VALUE self);
 static VALUE msr_track_length(VALUE self);
 
@@ -12,28 +11,12 @@ void Init_msr_track()
 
 	rb_define_const(c_MSR_Track, "MAX_TRACK_LEN", INT2NUM(MSR_MAX_TRACK_LEN));
 
-	rb_define_method(c_MSR_Track, "initialize", initialize, 1);
+	rb_define_method(c_MSR_Track, "initialize", msr_track_initialize, 1);
 	rb_define_method(c_MSR_Track, "data", msr_track_data, 0);
 	rb_define_method(c_MSR_Track, "length", msr_track_length, 0);
 }
 
-/*
-	A convenience function for instantiating a new MSR::Track in C.
-*/
-VALUE msr_track_new(msr_track_t tk)
-{
-	VALUE obj = rb_obj_alloc(c_MSR_Track);
-
-	VALUE tk_data_ary = rb_ary_new();
-
-	for (int i = 0; i < tk.msr_tk_len; i++) {
-		rb_ary_push(tk_data_ary, INT2NUM(tk.msr_tk_data[i]));
-	}
-
-	return initialize(obj, tk_data_ary);
-}
-
-static VALUE initialize(VALUE self, VALUE tk_data_ary)
+VALUE msr_track_initialize(VALUE self, VALUE tk_data_ary)
 {
 	int tk_len;
 
@@ -45,6 +28,10 @@ static VALUE initialize(VALUE self, VALUE tk_data_ary)
 		rb_raise(rb_eArgError, "Track >%d bytes", MSR_MAX_TRACK_LEN);
 	}
 
+	for (int i = 0; i < tk_len; ++i) {
+		Check_Type(rb_ary_entry(tk_data_ary, i), T_FIXNUM);
+	}
+
 	rb_iv_set(self, "@data", tk_data_ary);
 
 	return self;

data/ext/msr/tracks.c

@@ -1,6 +1,5 @@
 #include "msr.h"
 
-static VALUE initialize(VALUE self, VALUE tk1, VALUE tk2, VALUE tk3);
 static VALUE msr_tracks_track1(VALUE self);
 static VALUE msr_tracks_track2(VALUE self);
 static VALUE msr_tracks_track3(VALUE self);
@@ -11,26 +10,13 @@ void Init_msr_tracks()
 {
 	c_MSR_Tracks = rb_define_class_under(mMSR, "Tracks", rb_cObject);
 
-	rb_define_method(c_MSR_Tracks, "initialize", initialize, 3);
+	rb_define_method(c_MSR_Tracks, "initialize", msr_tracks_initialize, 3);
 	rb_define_method(c_MSR_Tracks, "track1", msr_tracks_track1, 0);
 	rb_define_method(c_MSR_Tracks, "track2", msr_tracks_track2, 0);
 	rb_define_method(c_MSR_Tracks, "track3", msr_tracks_track3, 0);
 }
 
-/*
-	A convenience function for instantiating a new MSR::Tracks in C.
-*/
-VALUE msr_tracks_new(msr_tracks_t tks)
-{
-	VALUE obj = rb_obj_alloc(c_MSR_Tracks);
-	VALUE tk1_obj = msr_track_new(tks.msr_tracks[0]);
-	VALUE tk2_obj = msr_track_new(tks.msr_tracks[1]);
-	VALUE tk3_obj = msr_track_new(tks.msr_tracks[2]);
-
-	return initialize(obj, tk1_obj, tk2_obj, tk3_obj);
-}
-
-static VALUE initialize(VALUE self, VALUE tk1, VALUE tk2, VALUE tk3)
+VALUE msr_tracks_initialize(VALUE self, VALUE tk1, VALUE tk2, VALUE tk3)
 {
 	if (CLASS_OF(tk1) != c_MSR_Track) {
 		rb_raise(rb_eArgError, "expected track object for track 1");

data/lib/msr.rb

@@ -1,7 +1,8 @@
 require_relative "../ext/msr/msr"
 require_relative "msr/track"
+require_relative "msr/tracks"
 require_relative "msr/msr206"
 
 module MSR
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

data/lib/msr/msr206.rb

@@ -1,4 +1,7 @@
 module MSR
   class MSR206
+    def linked?
+      comm_test! == :pass
+    end
   end
 end

data/lib/msr/track.rb

@@ -1,4 +1,8 @@
 module MSR
   class Track
+    def ==(o)
+      return unless o.is_a?(self.class)
+      data == o.data
+    end
   end
 end

data/lib/msr/tracks.rb

@@ -1,4 +1,8 @@
 module MSR
   class Tracks
+    def ==(o)
+      return unless o.is_a?(self.class)
+      track1 == o.track1 && track2 == o.track2 && track3 == o.track3
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies: []
 description: A library for controlling magnetic stripe reader/writers.
 email: william@tuffbizz.com
@@ -22,6 +22,7 @@ files:
 - ext/msr/extconf.rb
 - ext/msr/msr.c
 - ext/msr/msr206.c
+- ext/msr/shim.c
 - ext/msr/track.c
 - ext/msr/tracks.c
 - lib/msr.rb