snfoil-rails 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8317d5da3fd8d19a7ddc0c090c3065578d39ace6a431da7d3920e7dde76c92b0
-  data.tar.gz: ac1beda041a2d44d7e5066b3c9f39d9b8a1f28d1a8fe0f0c5cbdaf93047054d0
+  metadata.gz: 4abac143f7db3746ad50a7835536622ca08da91556555127272e2d0727777283
+  data.tar.gz: 47a3e2f6b65d9fdcb7c8a0cc57a52c923c391186a2d0a7ec22823ddf2bc98769
 SHA512:
-  metadata.gz: 70da8fe5e43597103002d545e6e48362ea855ffc78bf3edd1c6e4c4fcf2de745b28bed82bd1526c8801a23395b2d9a85436c69daa01f0243669c7786f73e9a68
-  data.tar.gz: 0c0e11fed83253c68c9c393e96b9328cc6f4081b4aa832d4963cf4cf0402f795624dc38481dfbc4f2887f8fbf6762b1f15afb09cb82140307e1c4ca28dbc5090
+  metadata.gz: a56430ee62d999e3700787f1796de5391695b6ea32b4726532e6c1479e04270a87bbdbe4d6be0cdce73d9c79c8ae8df378c4750b8c3aae0c3ed2caa8adc20892
+  data.tar.gz: 99a012a6a90c784dcecf959f93f2b4c19cf05cca1a32e7b966fc641ca9014948f8a9a0bad9cf697d9262c1ef758d8d6234c9f4e4327b39a62f0b4c7aa8105b43

data/lib/sn_foil/controller/api.rb

@@ -27,7 +27,7 @@ module SnFoil
       end
 
       def setup_options(**options)
-        inject_deserialized_params(super)
+        inject_deserialized_params(**super)
       end
 
       def setup_create(**options)

data/lib/sn_foil/controller/concerns/index_controller_concern.rb

@@ -24,11 +24,11 @@ module SnFoil
         end
 
         def process_index(**options)
-          current_context(**options).index(options)
+          current_context(**options).index(**options)
         end
 
         def render_index(results, **options)
-          render paginate(results, **options), meta: meta(results, options)
+          render paginate(results, **options), meta: meta(results, **options)
         end
 
         def paginate(results, **options)

data/lib/sn_foil/jsonapi_deserializer.rb

@@ -120,7 +120,7 @@ module SnFoil
       return attributes unless resource_data
 
       resource_data = data_id(resource_data, resource_data)
-      attribute_data = lookup_relationship(resource_data)
+      attribute_data = lookup_relationship(**resource_data)
       relationship_data = { data: attribute_data || resource_data }
       attributes[opts.fetch(:key) { key }] = deserializer.new(relationship_data, **options, included: included).parse
       attributes
@@ -132,7 +132,7 @@ module SnFoil
 
       attributes[opts.fetch(:key) { key }] = array_data.map do |resource_data|
         resource_data = data_id(resource_data, resource_data)
-        attribute_data = lookup_relationship(resource_data)
+        attribute_data = lookup_relationship(**resource_data)
         relationship_data = { data: attribute_data || resource_data }
         deserializer.new(relationship_data, **options, included: included).parse
       end

data/lib/sn_foil/rails/version.rb

@@ -2,6 +2,6 @@
 
 module SnFoil
   module Rails
-    VERSION = '0.8.3'
+    VERSION = '0.9.0'
   end
 end

data/lib/sn_foil/searcher.rb

@@ -85,16 +85,14 @@ module SnFoil
     end
 
     def apply_order(filtered_scope, params)
-      return apply_default_order(filtered_scope, params) if params[:order_by].blank? && params[:order].blank?
-
-      filtered_scope.order(order_by(params) => order(params))
-    end
-
-    def apply_default_order(filtered_scope, params)
       return order_method(filtered_scope, params) if order_method?
       return order_block(filtered_scope, params) if order_block?
 
-      filtered_scope.order(order_by => order)
+      if params[:order_by].blank? && params[:order].blank?
+        filtered_scope.order(order_by => order)
+      else
+        filtered_scope.order(order_by(params) => order(params))
+      end
     end
 
     def order_method(filtered_scope, params)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfoil-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Matthew Howes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2023-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 6.1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 6.1.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.7
 signing_key: 
 specification_version: 4
 summary: Additional functionality gem for using SnFoil with Rails