snfoil-rails 0.8.3 → 0.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8317d5da3fd8d19a7ddc0c090c3065578d39ace6a431da7d3920e7dde76c92b0
4
- data.tar.gz: ac1beda041a2d44d7e5066b3c9f39d9b8a1f28d1a8fe0f0c5cbdaf93047054d0
3
+ metadata.gz: bfdc322288169bedaad75e87ee5f85c7155bcdaddb1f7acb2e8d446eb518879d
4
+ data.tar.gz: f08cbf7eccf64cab8a999ee1b0c9b9c276682452de0391fd0d9ea60b08bfcd67
5
5
  SHA512:
6
- metadata.gz: 70da8fe5e43597103002d545e6e48362ea855ffc78bf3edd1c6e4c4fcf2de745b28bed82bd1526c8801a23395b2d9a85436c69daa01f0243669c7786f73e9a68
7
- data.tar.gz: 0c0e11fed83253c68c9c393e96b9328cc6f4081b4aa832d4963cf4cf0402f795624dc38481dfbc4f2887f8fbf6762b1f15afb09cb82140307e1c4ca28dbc5090
6
+ metadata.gz: 42fe6f01f14697a6d5f17486ad3a0b8e43d9205557b31cffa9f52bb3d1db42749427718902b561c99c5f464cce4b0661dda55c6191d4ebe7ce4564e5226a4784
7
+ data.tar.gz: d1595ff0f2692da7e14d19187b666089afe8ebf36601baf5ab786d9bf6c4aae11688f67c6c5e4acf2c6d5371dfb0dc4aa90fc4927b049597f58cd42298c98ce1
@@ -2,6 +2,6 @@
2
2
 
3
3
  module SnFoil
4
4
  module Rails
5
- VERSION = '0.8.3'
5
+ VERSION = '0.8.5'
6
6
  end
7
7
  end
@@ -85,16 +85,14 @@ module SnFoil
85
85
  end
86
86
 
87
87
  def apply_order(filtered_scope, params)
88
- return apply_default_order(filtered_scope, params) if params[:order_by].blank? && params[:order].blank?
89
-
90
- filtered_scope.order(order_by(params) => order(params))
91
- end
92
-
93
- def apply_default_order(filtered_scope, params)
94
88
  return order_method(filtered_scope, params) if order_method?
95
89
  return order_block(filtered_scope, params) if order_block?
96
90
 
97
- filtered_scope.order(order_by => order)
91
+ if params[:order_by].blank? && params[:order].blank?
92
+ filtered_scope.order(order_by => order)
93
+ else
94
+ filtered_scope.order(order_by(params) => order(params))
95
+ end
98
96
  end
99
97
 
100
98
  def order_method(filtered_scope, params)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: snfoil-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.3
4
+ version: 0.8.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matthew Howes
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-09-14 00:00:00.000000000 Z
13
+ date: 2021-09-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activesupport