activeset 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '090c118d248ba30a9211b369e12636499c05a95b'
-  data.tar.gz: 458586ba5bfcddaedaf6fab6ebaf09f8d36a6e14
+  metadata.gz: 0a35c45c1515b720f53f45bbaf0f56a3de6b36af
+  data.tar.gz: 65588202096e28453bd828643884b51489aa5f4a
 SHA512:
-  metadata.gz: 33676ed9e211c8fa8c70048851815d52931ba4b11ed6e3704180ee25629fd322dac291d72223c24757699698ae07726bb7f26b3d4a9c08bad62149009b845a62
-  data.tar.gz: 8db447ae3d2440bca54cb0a47c4d2f8c1ae93794087228ed702e7bffdd03aeaa60f09fd9431f7149cd1913cf959c572b9ac1bbee50be207c4afb491d6cb21713
+  metadata.gz: 691731355d82e7fd51af5b76ce8caffe3e54f4decef98986595f67b8916c043ae52cdf3fbbd694d568844302d2f609988befa62df5e6720e1b808111a59f93a7
+  data.tar.gz: 2c66f5a2d7ae05fbeebf0267ac36736f6ab42c0e42d9f70189af65b03f429ae88de4159489b7725c6f89a677c760230a7f14b9db518c287402f57f9220f38490

data/CHANGELOG

@@ -1,3 +1,5 @@
+v 0.8.3
+  - fix a bug to allow sorting of computed attributes on sets that include nil values
 v 0.8.2
   - fix a bug that prevents enumerable sets from being filtered down to empty sets
 v 0.8.1

data/activeset.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.name          = 'activeset'
-  spec.version       = '0.8.2'
+  spec.version       = '0.8.3'
   spec.authors       = ['Stephen Margheim']
   spec.email         = ['stephen.margheim@gmail.com']
 

data/lib/active_set/sorting/enumerable_strategy.rb

@@ -14,7 +14,19 @@ class ActiveSet
         # http://brandon.dimcheff.com/2009/11/18/rubys-sort-vs-sort-by/
         @set.sort_by do |item|
           @attribute_instructions.map do |instruction|
-            sortable_numeric_for(instruction, item) * direction_multiplier(instruction.value)
+            value_for_comparison = sortable_numeric_for(instruction, item)
+            direction_multiplier = direction_multiplier(instruction.value)
+
+            # in an ASC sort, nils float to the end of the list. In a DESC
+            # sort, nils float to the start of the list. This is achieved by
+            # wrapping each value_for_comparison in a tuple with 0 as the first
+            # element, and wrapping nil values with either 1 or -1 as the first
+            # element
+            if value_for_comparison.nil?
+              [direction_multiplier, 0]
+            else
+              [0, value_for_comparison * direction_multiplier]
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport