naturally 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 779c19dc2b8a8008edc6044aea5dd581d04fd231
-  data.tar.gz: 51fc1ee3a6591b169e3823d38c26df50bb58c7ab
+  metadata.gz: faf607f415ddcf15c148739259c52e174b0b3b46
+  data.tar.gz: 1dc1552d7a19456bc2a94a7a5eea5fe27e034516
 SHA512:
-  metadata.gz: 49b59c6d73db65805dc0e3d86fe7d8508e889d4634d0c9604e7fba9422e552c7dca242cdf34b0f8a534d912a3d1406a1d30d2d0ad6c7275c224871efc0087d85
-  data.tar.gz: 5d996f19d784d877090477bc82e340035506f2f9dbebf4acc03156f43e84740459e9c2b8cc7602f9ea8e866191d229a3acee3b887a1b4456b54560df207ad3f3
+  metadata.gz: e8b3ff9491b77930b6f2aee7a839e1c7855d5df50808667704ba35a645cf35c98408a2949f51435e6782538b1ead608ec8b1cd320b93612ae0dfa7661195f615
+  data.tar.gz: 3b192cfda48fd177e3c3dc9575ec48d4ee856935d22723d7b0c740ba918b94d925886d04366c07860cb194a7bdd0091bd345e1bc987981ff49c50c978ffc6636

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    naturally (1.0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.4)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  naturally!
+  rake (~> 10.0)
+  rspec (~> 2.0)

data/README.md

@@ -1,5 +1,5 @@
 # Naturally
-[![Build Status](https://travis-ci.org/dogweather/naturally.png)](https://travis-ci.org/dogweather/naturally)
+[![Build Status](https://travis-ci.org/dogweather/naturally.png)](https://travis-ci.org/dogweather/naturally) [![Code Climate](https://codeclimate.com/github/dogweather/naturally.png)](https://codeclimate.com/github/dogweather/naturally)
 
 Natural sorting with added support for legal document numbering.
 See [Sorting for Humans : Natural Sort Order](http://www.codinghorror.com/blog/2007/12/sorting-for-humans-natural-sort-order.html) and [Counting to 10 in Californian](http://www.weblaws.org/blog/2012/08/counting-from-1-to-10-in-californian/)
@@ -9,6 +9,9 @@ The core of the search is [from here](https://github.com/ahoward/version_sorter)
 several changes to handle the particular types of numbers that come up in statutes, such
 as *335.1, 336, 336a*, etc.
 
+`Naturally` will also sort "numbers" in college course code format such as
+*MATH101, MATH102, ...*. See the specs for examples.
+
 
 ## Installation
 

data/lib/naturally.rb

@@ -34,6 +34,8 @@ module Naturally
         return @val.to_i <=> other.val.to_i
       elsif numbers_with_letters? || other.numbers_with_letters?
         return simple_normalize(@val) <=> simple_normalize(other.val)
+      elsif letters_with_numbers? || other.letters_with_numbers?
+        return reverse_simple_normalize(@val) <=> reverse_simple_normalize(other.val)
       else
         return @val <=> other.val
       end
@@ -46,6 +48,10 @@ module Naturally
     def numbers_with_letters?
       val =~ /^\d+[a-zA-Z]+$/
     end
+
+    def letters_with_numbers?
+      val =~ /^[a-zA-Z]+\d+$/
+    end
     
     def simple_normalize(n)
       if n =~ /^(\d+)([a-zA-Z]+)$/
@@ -53,7 +59,15 @@ module Naturally
       else 
         return [n.to_i]
       end
-    end    
+    end
+
+    def reverse_simple_normalize(n)
+      if n =~ /^([a-zA-Z]+)(\d+)$/
+        return [$1, $2.to_i]
+      else
+        return [n.to_s]
+      end
+    end
   end
   
 end

data/lib/naturally/version.rb

@@ -1,3 +1,3 @@
 module Naturally
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/naturally_spec.rb

@@ -25,6 +25,12 @@ describe Naturally do
       b = %w[335 335.1 336 336a 337 337.1 337.2 337.15 337a]
       Naturally.sort(a).should == b
     end
+
+    it 'sorts when letters have numbers in them' do
+      a = %w[PC1, PC3, PC5, PC7, PC9, PC10, PC11, PC12, PC13, PC14, PROF2, PBLI, SBP1, SBP3]
+      b = %w[PBLI, PC1, PC3, PC5, PC7, PC9, PC10, PC11, PC12, PC13, PC14, PROF2, SBP1, SBP3]
+      Naturally.sort(a).should == b
+    end
     
     it 'sorts double digits with letters correctly' do
       a = %w[12a 12b 12c 13a 13b 2 3 4 5 10 11 12]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naturally
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Natural Sorting with support for legal numbering
 email:
@@ -17,9 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -36,17 +37,17 @@ require_paths:
 - lib
 required_ruby_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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Sorts numbers according to the way people are used to seeing them.