naturally 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c21d347e9e1658f3ebc10a896f5b96aa5192b00
-  data.tar.gz: 0d830b3bbb12d2a6debb452a421ce641f4062f6a
+  metadata.gz: 4e92f4d1a615260c308166aeb8e444042a8fcac4
+  data.tar.gz: fce65d08b22e07b490ad58f11bfa08e0ccaad5dc
 SHA512:
-  metadata.gz: 1ed7567011f553a3bfae3ce97f1d9642bc3f828691a6d6b0a2ad999fd3d72117a4f9736d958e30964ec50304b733ecbe4ed501df142e73c85765e7e0d487203e
-  data.tar.gz: 6467f4990f5ba292fb15464de537383d24388634a9509517f803d072c85815fb8de15f1a90cc345f4338a5484970a361bd1cf3d51172e8503c4ecff6f398fab1
+  metadata.gz: 9480f5bd22d47fd903b7714fd0cccf5b1f3e97a2dae758aefa770beaa557deba41b5af49491357f3f5a19de09e11a88a344988afad9276c73a6e51649ddfc84b
+  data.tar.gz: b71f7d4376eb1baced1dd2c7e027b7f25dec3aa62379878ddb8ddba15a4d8a761b43f0f687948a2b30ae3b86b1e1568bf1c49d17fd1ec51710fc75f5b9dad922

data/lib/naturally.rb

@@ -12,11 +12,16 @@ module Naturally
   end
 
   # Sort an array of objects "naturally" by a given attribute.
+  # If block is given, attribute is ignored and each object
+  # is yielded to the block to obtain the sort key.
   #
   # @param [Array<Object>] an_array the list of objects to sort.
   # @param [Symbol] an_attribute the attribute by which to sort.
+  # @param [Block] &block a block that should evaluate to the
+  #        sort key for the yielded object
   # @return [Array<Object>] the objects in natural sort order.
-  def self.sort_by(an_array, an_attribute)
+  def self.sort_by(an_array, an_attribute=nil, &block)
+    return sort_by_block(an_array, &block) if block_given?
     an_array.sort_by { |obj| normalize(obj.send(an_attribute)) }
   end
 
@@ -35,4 +40,16 @@ module Naturally
     tokens = complex_number.to_s.scan(/\p{Word}+/)
     tokens.map { |t| Segment.new(t) }
   end
+
+  private
+  # Sort an array of objects "naturally", yielding each object
+  # to the block to obtain the sort key.
+  #
+  # @param [Array<Object>] an_array the list of objects to sort.
+  # @param [Block] &block a block that should evaluate to the
+  #        sort key for the yielded object
+  # @return [Array<Object>] the objects in natural sort order.
+  def self.sort_by_block(an_array, &block)
+    an_array.sort_by { |obj| normalize(yield(obj)) }
+  end
 end

data/lib/naturally/version.rb

@@ -1,4 +1,4 @@
 module Naturally
   # Gem version
-  VERSION = '1.5.0'
+  VERSION = '2.0.0'
 end

data/spec/naturally_spec.rb

@@ -153,4 +153,26 @@ describe Naturally do
       ]
     end
   end
+
+  describe '#sort_naturally_by_block' do
+    it 'sorts using a block' do
+      releases = [
+        {:name => 'Saucy Salamander', :version => '13.10'},
+        {:name => 'Raring Ringtail',  :version => '13.04'},
+        {:name => 'Precise Pangolin', :version => '12.04.4'},
+        {:name => 'Maverick Meerkat', :version => '10.10'},
+        {:name => 'Quantal Quetzal',  :version => '12.10'},
+        {:name => 'Lucid Lynx',       :version => '10.04.4'}
+      ]
+      actual = Naturally.sort_by(releases){|r| r[:version]}
+      expect(actual.map{|r| r[:name]}).to eq [
+        'Lucid Lynx',
+        'Maverick Meerkat',
+        'Precise Pangolin',
+        'Quantal Quetzal',
+        'Raring Ringtail',
+        'Saucy Salamander'
+      ]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naturally
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Robb Shecter