version_sorter 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ca2c813ab2e3b07a3c6ba8c7cbac756613b61e7b514b0c06deac6d43b01d819e
-  data.tar.gz: caacf05c4444ed24ce2ec866af9bdc2b9455af2eba50afde6010a3d440088389
+SHA1:
+  metadata.gz: a8c82692288ea72e0ad0c5318293c8129299a147
+  data.tar.gz: a03518ac5700f0ff074cd02cbff312088686e1b7
 SHA512:
-  metadata.gz: 7cb7c84a4213cb66509f06809422892d9f14b0d95a955c5124764fa5fdb9881e8f0df86dec159d02fc585d3ee5b0816e39ac451135b675f1e3272ac512b8b93a
-  data.tar.gz: 493b92cb2e19a9e2d3b7cb2078c1965860fa299f35b3a07bc6342438903d2b379eb221ca6e32e074045f03ebb51bbc4740ec6beaa11d7f1678c8f325919dc027
+  metadata.gz: b31e76a36fd9d14ecdbc396802d0c52bd99ade19c60b18fe29ca08a4519e586d90bc34d8847da0dfaf73eae87d58990d642c5aec3e6704a6e6a986a2c88f93dd
+  data.tar.gz: 39467bac6e670ab4d6e47a10a1122d0b8fe4113764dc68889b0d0a18f840729c29e5e94a94b5c4ba6a433472cf59f2a0c34dd01cc8057c7458dbce5b3efbe159

data/ext/version_sorter/version_sorter.c

@@ -15,7 +15,6 @@
 #include <ruby.h>
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
 typedef int compare_callback_t(const void *, const void *);
 
 struct version_number {
@@ -57,8 +56,7 @@ compare_version_number(const struct version_number *a,
 			int cmp = 0;
 
 			if (num_a) {
-				int64_t cmp64 = (int64_t)ca->number - (int64_t)cb->number;
-				cmp = (int)max(-1, min(1, cmp64));
+				cmp = (int)ca->number - (int)cb->number;
 			} else {
 				cmp = strchunk_cmp(
 						a->original, &ca->string,
@@ -140,7 +138,7 @@ parse_version_number(const char *string)
 				version->comp[comp_n].string.len = offset - start;
 			} else {
 				version->comp[comp_n].number = number;
-				num_flags |= (1ull << comp_n);
+				num_flags |= (1 << comp_n);
 			}
 			comp_n++;
 			continue;
@@ -171,42 +169,12 @@ parse_version_number(const char *string)
 	return version;
 }
 
-struct sort_context {
-	VALUE rb_self;
-	VALUE rb_version_array;
-	compare_callback_t *cmp;
-	struct version_number **versions;
-};
-
-static VALUE
-rb_version_sort_1_cb(VALUE arg)
-{
-	struct sort_context *context = (struct sort_context *)arg;
-	long length, i;
-	VALUE *rb_version_ptr;
-
-	length = RARRAY_LEN(context->rb_version_array);
-	for (i = 0; i < length; ++i) {
-		VALUE rb_version = rb_ary_entry(context->rb_version_array, i);
-		context->versions[i] = parse_version_number(StringValueCStr(rb_version));
-		context->versions[i]->rb_version = rb_version;
-	}
-
-	qsort(context->versions, length, sizeof(struct version_number *), context->cmp);
-	rb_version_ptr = RARRAY_PTR(context->rb_version_array);
-
-	for (i = 0; i < length; ++i) {
-		rb_version_ptr[i] = context->versions[i]->rb_version;
-	}
-
-	return context->rb_version_array;
-}
-
 static VALUE
 rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)
 {
+	struct version_number **versions;
 	long length, i;
-	int exception;
+	VALUE *rb_version_ptr;
 
 	Check_Type(rb_version_array, T_ARRAY);
 
@@ -214,25 +182,30 @@ rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)
 	if (!length)
 		return rb_ary_new();
 
-	struct sort_context context = {
-		rb_self,
-		rb_version_array,
-		cmp,
-		xcalloc(length, sizeof(struct version_number *)),
-	};
-
-	VALUE result = rb_protect(rb_version_sort_1_cb, (VALUE)&context, &exception);
+	versions = xcalloc(length, sizeof(struct version_number *));
 
 	for (i = 0; i < length; ++i) {
-		xfree(context.versions[i]);
-	}
-	xfree(context.versions);
+		VALUE rb_version, rb_version_string;
+
+		rb_version = rb_ary_entry(rb_version_array, i);
+		if (rb_block_given_p())
+			rb_version_string = rb_yield(rb_version);
+		else
+			rb_version_string = rb_version;
 
-	if (exception) {
-		rb_jump_tag(exception);
+		versions[i] = parse_version_number(StringValuePtr(rb_version_string));
+		versions[i]->rb_version = rb_version;
 	}
 
-	return result;
+	qsort(versions, length, sizeof(struct version_number *), cmp);
+	rb_version_ptr = RARRAY_PTR(rb_version_array);
+
+	for (i = 0; i < length; ++i) {
+		rb_version_ptr[i] = versions[i]->rb_version;
+		xfree(versions[i]);
+	}
+	xfree(versions);
+	return rb_version_array;
 }
 
 static VALUE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: version_sorter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies: []
 description: VersionSorter is a C extension that does fast sorting of large sets of
   version strings.
@@ -22,7 +22,7 @@ files:
 - LICENSE
 - ext/version_sorter/extconf.rb
 - ext/version_sorter/version_sorter.c
-homepage: https://github.com/defunkt/version_sorter
+homepage: https://github.com/github/version_sorter#readme
 licenses:
 - MIT
 metadata: {}
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fast sorting of version strings