edlib 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72ca7381d858e17e8ba5e2641d072cb4f391410b97ef9138504efa6851020373
-  data.tar.gz: 180e15f4a09149af7031536817a635be580d55afd25896341cb44cf54a9902be
+  metadata.gz: b4014e8ff49033ae36755f0752dba89486afc104ad67cf528358a3e1d12d2cfd
+  data.tar.gz: 4241313686e900f0d5751f10375f5afc347208737f66d19830c8b89add5e02f0
 SHA512:
-  metadata.gz: 5f53003d5e12d9d55b40201f435a278b4a99d6e01569cf0f5e96a263822058257d3dd1b65c7c0f48d39a92177c271131d7752bf982c68893316e5dccbdeefc9f
-  data.tar.gz: 27e1ec9237c5f86fe8775100dbda7e2b9851071a9043cace94b927a65e372afa0b7cbbca741d51266b1f2a0493917eeaf1b4b60da92600def529b2e4ac724edb
+  metadata.gz: 586d9f3730505eb43b61eee2d875af40d8aa0f2cc852fd342ebea69566e83f8255f291d4f29b2c731591ec0c29d7057cfff3065707e537acedcf7fcd66cb4cd2
+  data.tar.gz: f18b99c6456cc9c62a052ea0cf873832d537001a8d92add2073faf14f77fe103b09de3d0888d02a2ab92d4ce4c5982ea4125dccd93263b150172db6af925788c

data/README.md

@@ -38,6 +38,26 @@ a.align("AACG", "TCAACCTG")
 |task                 |DISTANCE, LOC, PATH ["DISTANCE"]                                                    |
 |additional_equalities|List of pairs of characters, where each pair defines two characters as equal. [NULL]|
 
+
+```ruby
+a.align("AACG", "TCAACCTG", nice: true)
+
+# {
+#   :edit_distance=>1,                                                 
+#   :alphabet_length=>4,                                               
+#   :locations=>[[2, 4], [2, 5]],                                      
+#   :alignment=>[0, 0, 0, 1],                                          
+#   :cigar=>"3=1I",                                                    
+#   :query_aligned=>"AACG",                                            
+#   :match_aligned=>"|||-",                                            
+#   :target_aligned=>"AAC-"
+# }        
+```
+
+## Documentation
+
+https://kojix2.github.io/ruby-edlib/
+
 ## Development
 
 Pull requests welcome!

data/ext/edlib/edlib.cpp

@@ -889,10 +889,10 @@ static int myersCalcEditDistanceNW(const Word* const Peq, const int W, const int
                 (*alignData)->Ps[maxNumBlocks * c + b] = bl->P;
                 (*alignData)->Ms[maxNumBlocks * c + b] = bl->M;
                 (*alignData)->scores[maxNumBlocks * c + b] = bl->score;
-                (*alignData)->firstBlocks[c] = firstBlock;
-                (*alignData)->lastBlocks[c] = lastBlock;
                 bl++;
             }
+            (*alignData)->firstBlocks[c] = firstBlock;
+            (*alignData)->lastBlocks[c] = lastBlock;
         }
         //----------------------------------------------------------//
         //---- If this is stop column, save it and finish ----//
@@ -901,9 +901,9 @@ static int myersCalcEditDistanceNW(const Word* const Peq, const int W, const int
                 (*alignData)->Ps[b] = (blocks + b)->P;
                 (*alignData)->Ms[b] = (blocks + b)->M;
                 (*alignData)->scores[b] = (blocks + b)->score;
-                (*alignData)->firstBlocks[0] = firstBlock;
-                (*alignData)->lastBlocks[0] = lastBlock;
             }
+            (*alignData)->firstBlocks[0] = firstBlock;
+            (*alignData)->lastBlocks[0] = lastBlock;
             *bestScore_ = -1;
             *position_ = targetStopPosition;
             delete[] blocks;

data/ext/edlib/edlibext.c

@@ -1,20 +1,20 @@
 #include "ruby.h"
 #include "edlibext.h"
 
-#define ALIGNER_GET_(name) \
-	static VALUE \
-	aligner_get_##name(VALUE self) \
-	{ \
-	    EdlibAlignConfig *config = aligner_get_config(self); \
-		return get_##name(config); \
+#define ALIGNER_GET_(name)                               \
+	static VALUE                                           \
+			aligner_get_##name(VALUE self)                     \
+	{                                                      \
+		EdlibAlignConfig *config = aligner_get_config(self); \
+		return get_##name(config);                           \
 	}
 
-#define ALIGNER_SET_(name) \
-	static VALUE \
-	aligner_set_##name(VALUE self, VALUE value) \
-	{ \
-	    EdlibAlignConfig *config = aligner_get_config(self); \
-		return set_##name(config, value); \
+#define ALIGNER_SET_(name)                               \
+	static VALUE                                           \
+			aligner_set_##name(VALUE self, VALUE value)        \
+	{                                                      \
+		EdlibAlignConfig *config = aligner_get_config(self); \
+		return set_##name(config, value);                    \
 	}
 
 VALUE mEdlib;
@@ -26,12 +26,12 @@ static size_t aligner_config_memsize(const void *ptr);
 static void aligner_config_free(void *ptr);
 
 static const rb_data_type_t config_type = {
-	.wrap_struct_name = "RbAlignConfig",
-	.function = {
-		.dfree = aligner_config_free,
-		.dsize = aligner_config_memsize,
-	},
-	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
+		.wrap_struct_name = "RbAlignConfig",
+		.function = {
+				.dfree = aligner_config_free,
+				.dsize = aligner_config_memsize,
+		},
+		.flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 static VALUE
@@ -131,8 +131,8 @@ set_mode(EdlibAlignConfig *config, VALUE mode)
 	switch (TYPE(mode))
 	{
 	case T_STRING:;
-	    VALUE mode_str = rb_funcall(mode, rb_intern("upcase"), 0);
-	    char *mode_s = RSTRING_PTR(mode_str);
+		VALUE mode_str = rb_funcall(mode, rb_intern("upcase"), 0);
+		char *mode_s = RSTRING_PTR(mode_str);
 		if (strcmp(mode_s, "NW") == 0)
 		{
 			config->mode = EDLIB_MODE_NW;
@@ -252,7 +252,7 @@ static VALUE
 set_additional_equalities(EdlibAlignConfig *config, EdlibEqualityPair *eqpairs, VALUE equalities)
 {
 	Check_Type(equalities, T_ARRAY);
-	int len = RARRAY_LEN(equalities);
+	size_t len = RARRAY_LEN(equalities);
 	if (len == 0)
 	{
 		if (eqpairs != NULL)
@@ -264,9 +264,25 @@ set_additional_equalities(EdlibAlignConfig *config, EdlibEqualityPair *eqpairs,
 		config->additionalEqualitiesLength = 0;
 		return equalities;
 	}
+
+	// Check if len is too large
+	if (len > SIZE_MAX / sizeof(EdlibEqualityPair))
+	{
+		rb_raise(rb_eArgError, "Requested array is too large");
+	}
+
 	char *first_arr = malloc(len * sizeof(char));
 	char *second_arr = malloc(len * sizeof(char));
-	for (int i = 0; i < len; i++)
+	if (first_arr == NULL || second_arr == NULL)
+	{
+		if (first_arr != NULL)
+			free(first_arr);
+		if (second_arr != NULL)
+			free(second_arr);
+		rb_raise(rb_eNoMemError, "Failed to allocate memory for equality pairs");
+	}
+
+	for (size_t i = 0; i < len; i++)
 	{
 		VALUE pair = rb_ary_entry(equalities, i);
 		Check_Type(pair, T_ARRAY);
@@ -295,7 +311,7 @@ set_additional_equalities(EdlibAlignConfig *config, EdlibEqualityPair *eqpairs,
 
 	eqpairs = (EdlibEqualityPair *)malloc(sizeof(EdlibEqualityPair) * len);
 
-	for (int i = 0; i < len; i++)
+	for (size_t i = 0; i < len; i++)
 	{
 		eqpairs[i].first = first_arr[i];
 		eqpairs[i].second = second_arr[i];
@@ -341,7 +357,7 @@ aligner_initialize_raw(VALUE self, VALUE k, VALUE mode, VALUE task, VALUE additi
 	config->k = NUM2INT(k);
 	set_mode(config, mode);
 	set_task(config, task);
-	
+
 	if (additional_equalities != Qnil)
 	{
 		set_additional_equalities(config, eqpairs, additional_equalities);
@@ -365,11 +381,11 @@ aligner_align(VALUE self, VALUE query, VALUE target)
 	}
 
 	EdlibAlignResult result = edlibAlign(
-		StringValueCStr(query),
-		RSTRING_LEN(query),
-		StringValueCStr(target),
-		RSTRING_LEN(target),
-		*config);
+			StringValueCStr(query),
+			RSTRING_LEN(query),
+			StringValueCStr(target),
+			RSTRING_LEN(target),
+			*config);
 
 	if (result.status != 0)
 	{

data/lib/edlib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Edlib
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edlib
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kojix2
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies: []
 description: 'Lightweight, super fast C/C++ library for sequence alignment using edit
   (Levenshtein) distance. '
@@ -31,7 +31,7 @@ homepage: https://github.com/kojix2/ruby-edlib
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,8 +46,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: ruby-edlib is a wrapper for edlib.
 test_files: []