z85 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db559c519963849320043f3560f8a7971fed6d07a0cecee132d5286ce9d8a484
-  data.tar.gz: c394a65cefbb48fd7d6954816005bc325a26358a86b6b3eca88dad7e25db8714
+  metadata.gz: 1409814fc8e3091281bec7c6bda76f7179c27f6f3e95644d668584772de3a057
+  data.tar.gz: b2f6d1afec64d8db0c7fac818359c5174093b15498fb7b80fbc59bdfb2121cb9
 SHA512:
-  metadata.gz: 80169c9ecf71b235a45ebe7c0113b13fa699849cc7276f26b3c1e965e0e7a1598b3e4e7bf72b729dbc442862030bdc5046a59c36c8808e4f92a817995a5f9274
-  data.tar.gz: 5797ca4ed1c69a193ac1546434943cfd87400b651721a79ee23dc1120fbcd17bcbaf31ba478b2080768317804f76e01e6954fcd0b05e5ff8133364c4b8bd1924
+  metadata.gz: df15929a429850f26bcaebab4fb7690d47625a8e5fa92eb8acb8952017e9a6ba52fda003977b712249a127a6dfbd0b00e05709f7b59800339ac3e1a1b8f103a5
+  data.tar.gz: abdbac913d2db8aded52cfd67a31a54a6d3e8f9bb1eaf8ed29a1ac8df96a442fc919642399a27b15ca49b156884feb36859686c9f3a17ac068a1da82966c2574

data/ext/z85/z85.c

@@ -60,7 +60,7 @@ static byte decoder[96] = {
     0x21, 0x22, 0x23, 0x4F, 0x00, 0x50, 0x00, 0x00
 };
 
-static VALUE z85_encode(VALUE _mod, VALUE string)
+static VALUE encode(VALUE _mod, VALUE string)
 {
     byte* data = (byte*) StringValuePtr(string);
     long size = RSTRING_LEN(string);
@@ -93,10 +93,10 @@ static VALUE z85_encode(VALUE _mod, VALUE string)
     return out;
 }
 
-static VALUE z85_decode(VALUE _mod, VALUE string)
+static VALUE _decode(VALUE string, int padding)
 {
     char* data = StringValuePtr(string);
-    long size = RSTRING_LEN(string);
+    long size = RSTRING_LEN(string) - padding;
 
     if (size % 5)
         rb_raise(rb_eRuntimeError, "Invalid string, number of bytes must be a multiple of 5");
@@ -119,17 +119,42 @@ static VALUE z85_decode(VALUE _mod, VALUE string)
         }
     }
 
-    VALUE out = rb_str_new((const char*) decoded, decoded_size);
+    VALUE out = 0;
+    if (padding) {
+        int padding_length = data[size] - '0';
+        if (padding_length < 0 || padding_length > 3) {
+          rb_raise(rb_eRuntimeError, "Invalid padding length");
+        } else if (decoded_size >= (size_t) padding_length) {
+            out = rb_str_new((const char*) decoded, decoded_size - padding_length);
+        } else {
+            rb_raise(rb_eRuntimeError, "Invalid padded string");
+        }
+    } else {
+        out = rb_str_new((const char*) decoded, decoded_size);
+    }
+
     free(decoded);
 
     return out;
 }
 
+static VALUE decode(VALUE _mod, VALUE string)
+{
+    return _decode(string, 0);
+}
+
+static VALUE decode_with_padding(VALUE _mod, VALUE string)
+{
+    return _decode(string, 1);
+}
+
 /* This function has a special name and it is invoked by Ruby to initialize the extension. */
 void Init_z85()
 {
     VALUE z85 = rb_define_module("Z85");
 
-    rb_define_singleton_method(z85, "encode", z85_encode, 1);
-    rb_define_singleton_method(z85, "decode", z85_decode, 1);
+    rb_define_singleton_method(z85, "encode", encode, 1);
+    rb_define_singleton_method(z85, "decode", decode, 1);
+
+    rb_define_singleton_method(z85, "decode_with_padding", decode_with_padding, 1);
 }

data/lib/z85.rb

@@ -6,17 +6,8 @@ require "z85/version"
 module Z85
   def self.encode_with_padding(string)
     padding_length = 4 - (string.bytesize % 4)
-    string += "\0" * padding_length unless padding_length == 4
+    padding_length = 0 if padding_length == 4
+    string += "\0" * padding_length if padding_length > 0
     encode(string) + padding_length.to_s
   end
-
-  def self.decode_with_padding(encoded)
-    padding_length = encoded[-1].to_i
-    encoded.chop!
-
-    decoded = decode(encoded)
-    padding_length.times { decoded.chop! } unless padding_length == 4
-
-    decoded
-  end
 end

data/lib/z85/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Z85
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: z85
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Xavier Noria