version_sorter 1.1.0 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0b1041937013eee0cb93a83330c30e3f6c8b84c5
+  data.tar.gz: d3f4d2a6834e1e0d79f6ef71cd58da5941c372ae
+SHA512:
+  metadata.gz: e2d9d09fc0cdc43726e65d197ab5f768e46d2581706fd738c460ab0d90ae9ad893e0241ebc8eeb452691c92f2072412133050026144c92738a19b5df3f62acd6
+  data.tar.gz: d60d1df2d3bec7574541036ee0cd486aa448a82e8cd74d176a85d288d78b0f53debcf3d82f0dfa5b00e3368042331df58f164cc8a03c14b34cebc977a1035fef

data/ext/version_sorter/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
 
+$defs.push("-DBUILD_FOR_RUBY")
 have_library('pcre', 'pcre_compile')
 create_makefile("version_sorter")

data/ext/version_sorter/rb_version_sorter.c

@@ -26,19 +26,21 @@ rb_sort(VALUE obj, VALUE list)
     long len = RARRAY_LEN(list);
     long i;
     char **c_list = calloc(len, sizeof(char *));
+    int *ordering;
     VALUE rb_str, dest;
-    
+
     for (i = 0; i < len; i++) {
         rb_str = rb_ary_entry(list, i);
         c_list[i] = StringValuePtr(rb_str);
     }
-    version_sorter_sort(c_list, len);
-    
+    ordering = version_sorter_sort(c_list, len);
+
     dest = rb_ary_new2(len);
     for (i = 0; i < len; i++) {
-        rb_ary_store(dest, i, rb_str_new2(c_list[i]));
+        rb_ary_store(dest, i, rb_ary_entry(list, ordering[i]));
     }
-    
+    free(ordering);
+
     return dest;
 }
 
@@ -56,4 +58,4 @@ Init_version_sorter(void)
     rb_version_sorter_module = rb_define_module("VersionSorter");
     rb_define_module_function(rb_version_sorter_module, "sort", rb_sort, 1);
     rb_define_module_function(rb_version_sorter_module, "rsort", rb_rsort, 1);
-}
+}

data/ext/version_sorter/version_sorter.c

@@ -14,7 +14,7 @@
 #include "version_sorter.h"
 
 
-static VersionSortingItem * version_sorting_item_init(const char *);
+static VersionSortingItem * version_sorting_item_init(const char *, int);
 static void version_sorting_item_free(VersionSortingItem *);
 static void version_sorting_item_add_piece(VersionSortingItem *, char *);
 static void parse_version_word(VersionSortingItem *);
@@ -24,7 +24,7 @@ static enum scan_state scan_state_get(const char);
 
 
 VersionSortingItem *
-version_sorting_item_init(const char *original)
+version_sorting_item_init(const char *original, int idx)
 {
     VersionSortingItem *vsi = malloc(sizeof(VersionSortingItem));
     if (vsi == NULL) {
@@ -36,9 +36,10 @@ version_sorting_item_init(const char *original)
     vsi->widest_len = 0;
     vsi->original = original;
     vsi->original_len = strlen(original);
-	vsi->normalized = NULL;
+    vsi->original_idx = idx;
+    vsi->normalized = NULL;
     parse_version_word(vsi);
-    
+
     return vsi;
 }
 
@@ -48,12 +49,12 @@ version_sorting_item_free(VersionSortingItem *vsi)
     VersionPiece *cur;
     while (cur = vsi->head) {
         vsi->head = cur->next;
-		free(cur->str);
+        free(cur->str);
         free(cur);
     }
-	if (vsi->normalized != NULL) {
-		free(vsi->normalized);
-	}
+    if (vsi->normalized != NULL) {
+      free(vsi->normalized);
+    }
     free(vsi);
 }
 
@@ -67,7 +68,7 @@ version_sorting_item_add_piece(VersionSortingItem *vsi, char *str)
     piece->str = str;
     piece->len = strlen(str);
     piece->next = NULL;
-    
+
     if (vsi->head == NULL) {
         vsi->head = piece;
         vsi->tail = piece;
@@ -101,16 +102,16 @@ parse_version_word(VersionSortingItem *vsi)
     char current_char, next_char;
     char *part;
     enum scan_state current_state, next_state;
-    
+
     while ((current_char = vsi->original[start]) != '\0') {
         current_state = scan_state_get(current_char);
-        
+
         if (current_state == other) {
             start++;
             end = start;
             continue;
         }
-        
+
         do {
             end++;
             next_char = vsi->original[end];
@@ -118,17 +119,17 @@ parse_version_word(VersionSortingItem *vsi)
         } while (next_char != '\0' && current_state == next_state);
 
         size = end - start;
-        
+
         part = malloc((size+1) * sizeof(char));
         if (part == NULL) {
             DIE("ERROR: Not enough memory to allocate word")
         }
-        
+
         memcpy(part, vsi->original+start, size);
         part[size] = '\0';
-        
+
         version_sorting_item_add_piece(vsi, part);
-        
+
         start = end;
     }
 }
@@ -136,18 +137,18 @@ parse_version_word(VersionSortingItem *vsi)
 void
 create_normalized_version(VersionSortingItem *vsi, const int widest_len)
 {
-    VersionPiece *cur;    
+    VersionPiece *cur;
     int pos, i;
-    
+
     char *result = malloc(((vsi->node_len * widest_len) + 1) * sizeof(char));
     if (result == NULL) {
         DIE("ERROR: Unable to allocate memory")
     }
     result[0] = '\0';
     pos = 0;
-    
+
     for (cur = vsi->head; cur; cur = cur->next) {
-        
+
         /* Left-Pad digits with a space */
         if (cur->len < widest_len && isdigit(cur->str[0])) {
             for (i = 0; i < widest_len - cur->len; i++) {
@@ -178,32 +179,35 @@ compare_by_version(const void *a, const void *b)
     return strcmp((*(const VersionSortingItem **)a)->normalized, (*(const VersionSortingItem **)b)->normalized);
 }
 
-void
+int*
 version_sorter_sort(char **list, size_t list_len)
 {
     int i, widest_len = 0;
     VersionSortingItem *vsi;
     VersionSortingItem **sorting_list = calloc(list_len, sizeof(VersionSortingItem *));
+    int *ordering = calloc(list_len, sizeof(int));
 
     for (i = 0; i < list_len; i++) {
-        vsi = version_sorting_item_init(list[i]);
+        vsi = version_sorting_item_init(list[i], i);
         if (vsi->widest_len > widest_len) {
             widest_len = vsi->widest_len;
         }
         sorting_list[i] = vsi;
     }
-    
+
     for (i = 0; i < list_len; i++) {
         create_normalized_version(sorting_list[i], widest_len);
     }
 
     qsort((void *) sorting_list, list_len, sizeof(VersionSortingItem *), &compare_by_version);
-    
+
     for (i = 0; i < list_len; i++) {
         vsi = sorting_list[i];
         list[i] = (char *) vsi->original;
-        
-		version_sorting_item_free(vsi);
+        ordering[i] = vsi->original_idx;
+        version_sorting_item_free(vsi);
     }
     free(sorting_list);
-}
+
+    return ordering;
+}

data/ext/version_sorter/version_sorter.h

@@ -25,9 +25,15 @@
 
 #endif
 
+#if defined(BUILD_FOR_RUBY)
+#include <ruby.h>
+#define DIE(msg) \
+    rb_raise(rb_eRuntimeError, "%s", msg);
+#else
 #define DIE(msg) \
     fprintf(stderr, msg);\
-    exit(EXIT_FAILURE);\
+    exit(EXIT_FAILURE);
+#endif
 
 typedef struct _VersionSortingItem {
     struct _VersionPiece *head;
@@ -37,6 +43,7 @@ typedef struct _VersionSortingItem {
     char *normalized;
     const char *original;
     size_t original_len;
+    int original_idx;
 } VersionSortingItem;
 
 typedef struct _VersionPiece {
@@ -49,6 +56,6 @@ enum scan_state {
     digit, alpha, other
 };
 
-extern void version_sorter_sort(char **, size_t);
+extern int* version_sorter_sort(char **, size_t);
 
-#endif /* _VERSION_SORTER_H */
+#endif /* _VERSION_SORTER_H */

data/lib/version_sorter/version.rb

@@ -1,3 +1,3 @@
 module VersionSorter
-  Version = '1.1.0'
+  Version = '1.1.1'
 end

data/test/version_sorter_test.rb

@@ -12,6 +12,13 @@ class VersionSorterTest < Test::Unit::TestCase
     assert_equal sorted_versions, sort(versions)
   end
 
+  def test_returns_same_object
+    versions = %w( 2.0 1.0 0.5 )
+    sorted = sort(versions)
+
+    assert_equal versions[2].object_id, sorted[0].object_id
+  end
+
   def test_reverse_sorts_verisons_correctly
     versions = %w(1.0.9 1.0.10 2.0 3.1.4.2 1.0.9a)
     sorted_versions = %w( 3.1.4.2 2.0 1.0.10 1.0.9a 1.0.9 )

metadata

@@ -1,30 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: version_sorter
-version: !ruby/object:Gem::Version 
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Chris Wanstrath
 - K. Adam Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-10-14 00:00:00 -07:00
-default_executable: 
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies: []
-
 description: Fast sorting of version strings
 email: chris@ozmm.org
 executables: []
-
-extensions: 
+extensions:
 - ext/version_sorter/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
-- .gitattributes
-- .gitignore
+files:
+- ".gitattributes"
 - README.markdown
 - Rakefile
 - ext/version_sorter/extconf.rb
@@ -42,35 +37,28 @@ files:
 - test/tags.rb
 - test/tags.txt
 - test/version_sorter_test.rb
-has_rdoc: true
 homepage: http://github.com/defunkt/version_sorter
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fast sorting of version strings
-test_files: 
-- test/tags.rb
-- test/version_sorter_test.rb
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-# xcode noise
-ext/version_sorter/build/*
-*.pbxuser
-*.mode1v3