activeset 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54b59c64a9123a20e6c545a47465ad67fb32ab50
-  data.tar.gz: 047caa653858d885ccc875590374989e9a29463c
+  metadata.gz: b5476ab3f9de94a85dc7b5a891d1bef17a39ecd8
+  data.tar.gz: e17b933d743291d3c0eaa5aaae990dc056b47b84
 SHA512:
-  metadata.gz: ba97bcac5e9a3e8e08cfddb65cf366773229358a7a4e8c5821d20ae1a55e9af620c01c8ecd860e978168b295fc5c4d369ee6419de78e003398d2c1a14a772a9a
-  data.tar.gz: f9521e71e1e5aaafea6d60f0c4bbd7f98f126bb0374e31f253a7eaaa9985c34d3a8dcd6eea697bbdbd3741ffcf1ddb0fdefae751efd0b8cc308659485305dcc4
+  metadata.gz: efae3f352fc6e1038583adb2aea3bbcb45963f972290c13d0f2a67d80db5209a9cab2eb7e80dc4bf8611f35bb4de8005eb5843cb97fdb363aa6fcc48b937f333
+  data.tar.gz: f484dc6b89b189e8dfcae29d71429639966b2e7836108c34d4dd58d7f4aa8b4d9f6fdd6915eb806f0a9d317b0bbac2cdcf1a65bca0bcf9c4cd12e3a14ee17a08

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Metrics/LineLength:
   Max: 120
   # To make it possible to copy or click on URIs in the code, we allow lines

data/CHANGELOG

@@ -1,3 +1,10 @@
+v 0.8.6
+  - fix a bug where ActiveRecord sorting didn't treat NULL values in the same way as Enumerable sorting
+    + where NULL values are sorted as if larger than any non-null value
+  - fix a bug with ActiveRecord scope filtering
+    + if we try to use a class method scope that returns something other than an ActiveRecord::Relation
+  - update the scopes filtering specs to be more generalized and exhaustive
+  - clean up specs in general
 v 0.8.5
   - fix a bug in Enumerable class method filtering when method returns object, not array
   - add specs for Enumerable filtering

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activeset (0.8.5)
+    activeset (0.8.6)
       activesupport (>= 4.0.2)
 
 GEM

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.5'
+  spec.version       = '0.8.6'
   spec.authors       = ['Stephen Margheim']
   spec.email         = ['stephen.margheim@gmail.com']
 

data/lib/active_set/filtering/active_record_strategy.rb

@@ -14,13 +14,15 @@ class ActiveSet
         if execute_where_operation?
           statement = where_operation
         elsif execute_merge_operation?
-          statement = merge_operation
+          begin
+            statement = merge_operation
+          rescue ArgumentError # thrown if merging a non-ActiveRecord::Relation
+            return false
+          end
         else
           return false
         end
 
-        return false if throws?(ActiveRecord::StatementInvalid) { statement.load }
-
         statement
       end
 

data/lib/active_set/sorting/active_record_strategy.rb

@@ -41,15 +41,19 @@ class ActiveSet
         @set.eager_load(associations_hash)
       end
 
+      # https://stackoverflow.com/a/44912964/2884386
+      # Force null values to be sorted as if larger than any non-null value
+      # ASC => [-2, -1, 1, 2, nil]
+      # DESC => [nil, 2, 1, -1, -2]
       def order_operation_for(attribute_instruction)
         attribute_model = attribute_model_for(attribute_instruction)
 
         arel_column = Arel::Table.new(attribute_model.table_name)[attribute_instruction.attribute]
         arel_column = case_insensitive?(attribute_instruction) ? arel_column.lower : arel_column
-
         arel_direction = direction_operator(attribute_instruction.value)
+        nil_sorter = arel_column.send(arel_direction == :asc ? :eq : :not_eq, nil)
 
-        attribute_model.order(arel_column.send(arel_direction))
+        attribute_model.order(nil_sorter).order(arel_column.send(arel_direction))
       end
 
       def attribute_model_for(attribute_instruction)

data/lib/active_set/sorting/enumerable_strategy.rb

@@ -17,11 +17,9 @@ class ActiveSet
             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
+            # Force null values to be sorted as if larger than any non-null value
+            # ASC => [-2, -1, 1, 2, nil]
+            # DESC => [nil, 2, 1, -1, -2]
             if value_for_comparison.nil?
               [direction_multiplier, 0]
             else

metadata

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