id_shuffler 0.0.3 → 0.0.4

data/ext/id_shuffler/id_shuffler.c

@@ -31,6 +31,9 @@
  *
  */
 
+const int i = 1;
+#define is_bigendian() ( (*(char*)&i) == 0 )
+
 const char ftable[256] = { 
 0xa3,0xd7,0x09,0x83,0xf8,0x48,0xf6,0xf4,0xb3,0x21,0x15,0x78,0x99,0xb1,0xaf,0xf9,
 0xe7,0x2d,0x4d,0x8a,0xce,0x4c,0xca,0x2e,0x52,0x95,0xd9,0x1e,0x4e,0x38,0x44,0x28,
@@ -65,6 +68,16 @@ uint32_t g(char key[10], int k, uint32_t w)
     return (((g5<<8) + g6) & 32767); /* clip result to 15 bits */
 }
 
+static VALUE r_g1(VALUE self) {
+  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  return ULONG2NUM(g(key,1,1));
+}
+
+static VALUE r_g2(VALUE self) {
+  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  return ULONG2NUM(g(key,1,32767));
+}
+
 uint32_t skip30(char key[10], uint32_t num, int encrypt)
 {
     int         k; /* round number */
@@ -93,6 +106,44 @@ uint32_t skip30(char key[10], uint32_t num, int encrypt)
     return (wr << 15) + (wl);
 }
 
+static VALUE r_skip1(VALUE self) {
+  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  return ULONG2NUM(skip30(key,1,1));
+}
+
+static VALUE r_skip2(VALUE self) {
+  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  return ULONG2NUM(skip30(key,32767,1));
+}
+
+static VALUE r_skip3(VALUE self, VALUE original_num) {
+  char key[10] = {1,2,3,4,5,6,7,8,9,10};
+  unsigned long original_ulong;
+  original_ulong = NUM2ULONG(original_num);
+  uint32_t original = original_ulong;
+  return ULONG2NUM(skip30(key,original,1));
+}
+
+static VALUE r_skip4(VALUE self, VALUE original_num, VALUE key_str) {
+  char *key = StringValuePtr(key_str);
+  unsigned long original_ulong;
+  original_ulong = NUM2ULONG(original_num);
+  uint32_t original = original_ulong;
+  return ULONG2NUM(skip30(key,original,1));
+}
+
+//uint32_t little_endian_swap(uint32_t num)
+//{
+//  if (is_bigendian()) {
+//    return num;
+//  } else {
+//    return ((num>>24)&0xff) | // move byte 3 to byte 0
+//           ((num<<8)&0xff0000) | // move byte 1 to byte 2
+//           ((num>>8)&0xff00) | // move byte 2 to byte 1
+//           ((num<<24)&0xff000000); // byte 0 to byte 3
+//  }
+//}
+
 static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
   /* takes a number and a key string as input and returns a base-32 encoded
    * shuffled id. */
@@ -114,6 +165,7 @@ static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
 
   /* encrypt */
   uint32_t original = original_ulong;
+  //uint32_t shuffled = skip30(key, little_endian_swap(original), 1);
   uint32_t shuffled = skip30(key, original, 1);
 
   /* base-32 encode the result using "crockford 32" alphabet */
@@ -128,6 +180,20 @@ static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
   return rb_str_new(buf,6);
 }
 
+static VALUE r_b32(VALUE self, VALUE original_num) {
+  char buf[6];
+  char *digits = "0123456789abcdefghjkmnpqrstvwxyz";
+  int cpos;
+  unsigned long original_ulong;
+  original_ulong = NUM2ULONG(original_num);
+  uint32_t original = original_ulong;
+  for (cpos = 0; cpos < 6; cpos ++) {
+    buf[cpos] = digits[((original >> (5*(5-cpos))) & 31)];
+  }
+  return rb_str_new(buf,6);
+}
+
+
 static VALUE r_base32_unshuffle(VALUE self, VALUE shuffled_str, VALUE key_str) {
   /* take the a base-32 encoded ruby string and a key string, decodes and
    * unshuffles it, producing the original number. */
@@ -164,6 +230,7 @@ static VALUE r_base32_unshuffle(VALUE self, VALUE shuffled_str, VALUE key_str) {
   }
 
   /* decrypt */
+  //uint32_t original = little_endian_swap( skip30(key, shuffled, 0) );
   uint32_t original = skip30(key, shuffled, 0);
 
   /* return a ruby number */
@@ -178,5 +245,12 @@ void Init_id_shuffler(void) {
   VALUE klass = rb_define_class("IdShuffler", rb_cObject);
   rb_define_singleton_method(klass, "shuffle_with_raw_key", r_base32_shuffle, 2);
   rb_define_singleton_method(klass, "unshuffle_with_raw_key", r_base32_unshuffle, 2);
+  rb_define_singleton_method(klass, "g1", r_g1,0);
+  rb_define_singleton_method(klass, "g2", r_g2,0);
+  rb_define_singleton_method(klass, "skip1", r_skip1,0);
+  rb_define_singleton_method(klass, "skip2", r_skip2,0);
+  rb_define_singleton_method(klass, "skip3", r_skip3,1);
+  rb_define_singleton_method(klass, "skip4", r_skip4,2);
+  rb_define_singleton_method(klass, "b32", r_b32,1);
 }
 

data/lib/id_shuffler.rb

@@ -41,4 +41,8 @@ class IdShuffler
     unshuffle_with_raw_key(s.to_s, Digest::MD5.digest(key))
   end
 
+  def self.version
+    "0.0.4"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id_shuffler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: