data_matrix 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4f71b784d1454fdc371e8565479b0404f5f4bc
-  data.tar.gz: e385701eaf8326b9a4fce2e04eb3414341643925
+  metadata.gz: 61a44ce56b60d36d4d999cddbc067ea276f0ebc6
+  data.tar.gz: 78b28d2f4e8ea39fca5a029f3d6739368b1d10b0
 SHA512:
-  metadata.gz: 38213745494b7b57f1dfb489c778c1ff2c18274e88cbd0919337c158ec13a91101522f4f7a7f20b5d22c134da399aebd8d1967e37996ebed0114f94c2790d8a7
-  data.tar.gz: aee294d8edf2b0db6eee86d41ee79c4855a1f8cd7edcddd4fdbe6f3c0e73c9b7830534635edaac3a3cebdfd20e2bbef3d1076013952a0b44b727efda5790a0c4
+  metadata.gz: 589f593ad79a1ee7be3c3755de39edf8fd9f653101a9b36060d273aac0e0f7a4f02248a017d69fa0ed677c42278cf8457eaa0923870ea94daedf4a9e039d152c
+  data.tar.gz: 9fc7c90ec08521995f7e5a2005bdf7804ee3cba84ec1fce3ab5e9422144f7330117e04a9e438ebf75e6a29835e255bbfd8a6005f9c93f25ed01a3b7cc1e5fb43

data/ext/data_matrix/data_matrix.c

@@ -18,7 +18,6 @@ semacode_t* encode_string(semacode_t* semacode, const char *message) {
     free(semacode->encoding);
   }
 
-  bzero(semacode, sizeof(semacode_t));
   fixed_message = strdup(message);
   strcat(fixed_message, " ");
 
@@ -35,13 +34,7 @@ semacode_t* encode_string(semacode_t* semacode, const char *message) {
 }
 
 static void data_matrix_mark(semacode_t* semacode) {
-  semacode->width = 0;
-  semacode->height = 0;
-  semacode->raw_encoded_length = 0;
-  semacode->symbol_capacity = 0;
-  semacode->ecc_bytes = 0;
-  semacode->encoding = NULL;
-  semacode->data = NULL;
+  bzero(semacode, sizeof(semacode_t));
 }
 
 static void data_matrix_free(semacode_t* semacode) {
@@ -50,7 +43,6 @@ static void data_matrix_free(semacode_t* semacode) {
       free(semacode->encoding);
       free(semacode->data);
     }
-    bzero(semacode, sizeof(semacode));
     free(semacode);
   }
 }
@@ -77,12 +69,17 @@ static VALUE data_matrix_grid(semacode_t *semacode) {
 }
 
 static VALUE data_matrix_allocate(VALUE klass) {
-  semacode_t *semacode;
-  return Data_Make_Struct(klass, semacode_t, data_matrix_mark, data_matrix_free, semacode);
+  semacode_t *semacode = malloc(sizeof(semacode_t));
+  bzero(semacode, sizeof(semacode_t));
+  return Data_Wrap_Struct(klass, data_matrix_mark, data_matrix_free, semacode);
 }
 
 static VALUE data_matrix_init(VALUE self, VALUE message) {
   semacode_t *semacode;
+
+  if (!rb_respond_to(message, rb_intern("to_s")))
+    rb_raise(rb_eArgError, "target must respond to 'to_s'");
+
   Data_Get_Struct(self, semacode_t, semacode);
 
   encode_string(semacode, StringValuePtr(message));
@@ -93,7 +90,7 @@ static VALUE data_matrix_init(VALUE self, VALUE message) {
 static VALUE data_matrix_encode(VALUE self, VALUE encoding) {
   semacode_t *semacode;
 
-  if (!rb_respond_to(encoding, rb_intern ("to_s")))
+  if (!rb_respond_to(encoding, rb_intern("to_s")))
     rb_raise(rb_eRuntimeError, "target must respond to 'to_s'");
 
   Data_Get_Struct(self, semacode_t, semacode);
@@ -193,7 +190,7 @@ void Init_data_matrix(void) {
 
   rb_define_alloc_func(rb_cEncoder, data_matrix_allocate);
 
-  rb_define_method(rb_cEncoder, "encode_string", data_matrix_init, 1);
+  rb_define_method(rb_cEncoder, "initialize", data_matrix_init, 1);
   rb_define_method(rb_cEncoder, "encode", data_matrix_encode, 1);
   rb_define_method(rb_cEncoder, "data", data_matrix_data, 0);
   rb_define_method(rb_cEncoder, "encoding", data_matrix_encoded, 0);

data/lib/data_matrix/encoder.rb

@@ -6,9 +6,10 @@ module DataMatrix
     alias to_str to_s
     alias to_a data
 
-    def initialize(value)
-      raise ArgumentError, 'Value must be convertible to string' unless value.respond_to?(:to_s)
-      encode_string(value.to_s)
+    class << self
+      def encode_string(value)
+        new(value)
+      end
     end
 
     def length

data/lib/data_matrix/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module DataMatrix
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_matrix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mikhail Bortnyk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler