unnatural 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0b35ed79162c58be6d1ed2af2022d18f19615d
-  data.tar.gz: 4be5c919b28dd739b6d1cc4f9c2d8d01d49b6411
+  metadata.gz: e73154b350d906339b8003056791db6c5f94e098
+  data.tar.gz: ed95cd6dee1227b8f55cce433998685fd1b2c4bb
 SHA512:
-  metadata.gz: 41c9475d5c6f7fb41dd962ddb1a11a2d5ac212d3186028a0d4b0c248efa91c8489a37f8973f9acbb2324e4fac62b14cdaee08990bb16b5530cf7c6e8c521cff2
-  data.tar.gz: 5c19f5a7b5a05715d2967ea03104b3f3a7649d09bb7bac3476ea4d018707779f4f9ebd533ba8529fcb6e7ada69375a403aee9ec86017dbfdbc7c1d1eb719b1a9
+  metadata.gz: d0c8774280f8fdba7f71b1b39bbe63b6558a9a1b4659807b33a7c8b4acbb0c441739184e9155e0b440479fa29981403aad18bf3fc983eaca01c5d2e4fc1c5426
+  data.tar.gz: 96c913547575eb192399c6074237748c3defb54032fc0f5d4f3644293ba24a81c846e91589398ac09c1b6e19ad575284e2dc57c96327c1795fc02ca27e4beae8

data/README.md

@@ -16,7 +16,7 @@ Unnatural does not (currently) provide support for:
 2. any number representation other than simple decimal integers
 3. whitespace insensitivity (i.e., one space and two spaces can be considered as different)
 
-Unnatural provides four algorithms, all of which use Ruby's built-in quicksort as the fundamental sort algorithm. All four modules provide module methods `.sort` for simply sorting an enumerable, and `.compare` for spaceship-operator-style comparison.
+Unnatural provides four algorithms, all of which use Ruby's built-in quicksort as the fundamental sort algorithm. All four modules provide module methods `.sort` for simply sorting an enumerable, `.sort_by` for a memoized sort according to a block, and `.compare` for spaceship-operator-style comparison.
 
 ### Unnatural::Fast
 
@@ -59,6 +59,13 @@ require 'unnatural'
 sorted = Unnatural.sort(some_array_of_strings)
 ```
 
+Sorting an enumerable of objects according to a block:
+
+```ruby
+sorted = Unnatural.sort_by(some_array_of_objects) { |e| e.name }
+sorted = Unnatural.sort_by(some_array_of_objects, &:name)
+```
+
 Defining the comparison method for a class explicitly:
 
 ```ruby

data/ext/unnatural/fast_compare.c

@@ -8,17 +8,28 @@ static VALUE rb_mFast;
 #define IS_LOWER(C) ('a' <= C && C <= 'z')
 #define UPCASE(C)   (IS_LOWER(C) ? C - ('a' - 'A') : C)
 
-VALUE compare(VALUE self, VALUE a_value, VALUE b_value) {
-  int a_length = RSTRING_LEN(a_value);
-  int b_length = RSTRING_LEN(b_value);
-  char* a_str = RSTRING_PTR(a_value);
-  char* b_str = RSTRING_PTR(b_value);
-  int a_pos = 0;
-  int b_pos = 0;
-  int a_number = 0;
-  int b_number = 0;
-  char a, b;
-  int diff = 0;
+VALUE compare(VALUE self, VALUE a_arg, VALUE b_arg) {
+  VALUE a_value, b_value;
+  int a_length, b_length, a_pos, b_pos, a_number, b_number, diff;
+  char *a_str, *b_str, a, b;
+
+  if (RB_TYPE_P(a_arg, T_ARRAY)) {
+    a_value = rb_ary_entry(a_arg, 0);
+    b_value = rb_ary_entry(b_arg, 0);
+  } else {
+    a_value = a_arg;
+    b_value = b_arg;
+  }
+
+  a_length = RSTRING_LEN(a_value);
+  b_length = RSTRING_LEN(b_value);
+  a_str = RSTRING_PTR(a_value);
+  b_str = RSTRING_PTR(b_value);
+  a_pos = 0;
+  b_pos = 0;
+  a_number = 0;
+  b_number = 0;
+  diff = 0;
 
   for (a_pos = 0, b_pos = 0; a_pos < a_length && b_pos < b_length; a_pos++, b_pos++) {
     a = a_str[a_pos];

data/lib/unnatural/fast.rb

@@ -6,6 +6,14 @@ unless RUBY_ENGINE == 'jruby'
       def self.sort(enumerable)
         enumerable.sort { |a, b| compare(a, b) }
       end
+
+      def self.sort_by(enumerable)
+        raise ArgumentError, "Block expected but none given" unless block_given?
+        enumerable
+          .map { |e| [(yield e), e] }
+          .sort { |a, b| compare(a, b) }
+          .map { |ary| ary[1] }
+      end
     end
   end
 

data/lib/unnatural/scan.rb

@@ -6,7 +6,20 @@ module Unnatural
       enumerable.sort { |a, b| compare(a, b) }
     end
 
+    def self.sort_by(enumerable)
+      raise ArgumentError, "Block expected but none given" unless block_given?
+      enumerable
+        .map { |e| [(yield e), e] }
+        .sort { |a, b| compare(a, b) }
+        .map { |ary| ary[1] }
+    end
+
     def self.compare(a_string, b_string)
+      if a_string.is_a?(Array) && b_string.is_a?(Array)
+        a_string = a_string.first
+        b_string = b_string.first
+      end
+
       a = StringScanner.new(a_string)
       b = StringScanner.new(b_string)
 

data/lib/unnatural/split.rb

@@ -7,6 +7,11 @@ module Unnatural
       enumerable.sort_by { |s| split(s) }
     end
 
+    def self.sort_by(enumerable)
+      raise ArgumentError, "Block expected but none given" unless block_given?
+      enumerable.sort_by { |s| split(yield s) }
+    end
+
     def self.compare(a, b)
       split(a) <=> split(b)
     end

data/lib/unnatural/substitution.rb

@@ -5,6 +5,12 @@ module Unnatural
       enumerable.sort_by { |s| substitute(s, largest) }
     end
 
+    def self.sort_by(enumerable)
+      raise ArgumentError, "Block expected but none given" unless block_given?
+      largest = enumerable.map { |e| yield e }.map(&:size).max
+      enumerable.sort_by { |s| substitute((yield s), largest) }
+    end
+
     def self.compare(a, b)
       largest = a.size < b.size ? b.size : a.size
       substitute(a, largest) <=> substitute(b, largest)

data/lib/unnatural/version.rb

@@ -1,3 +1,3 @@
 module Unnatural
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/unnatural.rb

@@ -19,6 +19,11 @@ module Unnatural
     @algorithm.sort(enumerable)
   end
 
+  def self.sort_by(enumerable)
+    raise ArgumentError, "Block expected but none given" unless block_given?
+    @algorithm.sort_by(enumerable) { |*a| yield(*a) }
+  end
+
   def self.compare(a, b)
     @algorithm.compare(a, b)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unnatural
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Miller