graphql-filters 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e8dec5946ab6eef47034012795f666d1714a4d67e5cee5ecaa105fd4a33e47
-  data.tar.gz: 52eaaf103d30162c293e6dd71df104455ae6adea20832f5acb1495379e084ab7
+  metadata.gz: 1ea0487a315eba7379064803399873439f3c0f8d4f4834a036018d393b85338a
+  data.tar.gz: 0c304de0494022456ea6cd65b893390c0b57ea6033852c8b676af92d7d5f1ad2
 SHA512:
-  metadata.gz: cf5c8e6bd9fa9d30140affe06cb1f5e7cad8f04787a131d42419a28b4ed5a43cb13cd18179c7da3e07645e4cb043cc240f326d0066d8390ff3ca01f4be12c1f3
-  data.tar.gz: 8e0b3de41937ffd98350dec8409fd8757d20d46e4f8f917ffb24ceb0856fa0450736c838a91e3d6333bb152e1d99cd478862a95899a3145ad7c70e089a50b595
+  metadata.gz: 77cdc50f80b142628f1b66ba80ac6db8c5d9f86f477f5ec9ebff3ede53b0ad3bba58cb850774c7f9573e964a172aef35f532dc3880efa73631fed897222dd6ce
+  data.tar.gz: bed2892de9d4ce4c7c5a3e0c5c121624eac2a56d1870e879b45048af57e07a36acc34771936056e806baf629b2b4132149e059ab427d9c70931cd52ecbaaa4a7

data/CHANGELOG.md

@@ -8,6 +8,13 @@
 ### Bug fixes
 )
 
+## 1.0.1 2023-03-15
+
+### Bug fixes
+
+- Fixed the priority of options declarations for fields
+- Fixed the override of `method_name` for the column name to use in the Active Record query
+
 ## 1.0.0 2023-03-06
 
 First release. Refer to [README.md](README.md) for the full documentation.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql-filters (1.0.0)
+    graphql-filters (1.0.1)
       activerecord (~> 7.0.0)
       activesupport (~> 7.0.0)
       graphql (~> 2.0.0)

data/README.md

@@ -9,7 +9,7 @@ This gem provides a module to include (or prepend, see below) in your resolvers
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'graphql-filters', '~> 0.1.0'
+gem 'graphql-filters', '~> 1.0'
 ```
 
 And then execute:
@@ -24,7 +24,7 @@ The easiest way to use GraphQL Filters is on top of [SearchObject](https://githu
 ```ruby
 class RoutesResolver < BaseResolver
   include SearchObject.module(:graphql)
-  
+
   scope { Route.all }
 
   type [RouteType], null: false
@@ -33,12 +33,12 @@ class RoutesResolver < BaseResolver
 end
 ```
 
-Otherwise, you have to explicitly define a `resolve` method and have it return an `ActiveRecord::Relation`; in this case youy need to prepend `GraphQL::Filters::Filterable` in the resolver, otherwise it won't have access to the starting scope:
+Otherwise, you have to explicitly define a `resolve` method and have it return an `ActiveRecord::Relation`; in this case you need to prepend `GraphQL::Filters::Filterable` in the resolver, otherwise it won't have access to the starting scope:
 
 ```ruby
 class RoutesResolver < BaseResolver
   type [RouteType], null: false
-  
+
   def resolve
     Route.all
   end
@@ -217,7 +217,7 @@ end
   Can be `true` or `false` (default: `true`). Controls whether or not the client can use this field in the filters. Passing `true` or `false` directly to `filter` is a shortcut:
 
 ```ruby
-field :name, String, null: false, filter: false 
+field :name, String, null: false, filter: false
 
 # is equivalent to
 
@@ -229,7 +229,7 @@ field :name, String, null: false, filter: {enabled: false}
   The name of the attribute that the field is tied to in the model. Defaults to the name of the resolver method for the field (which by default is the same as the name of the field itself).
 
 - `association_name`
-  
+
   The name of the Active Record association that the field is tied to in the model. Equivalent to `attribute_name`, has the same default.
 
 ## Plans for future development

data/lib/graphql/filters/dsl/graphql/schema/field.rb

@@ -43,21 +43,18 @@ monkey_patch = Module.new do
                 options
               end
 
-    applied_filter_options_defaults = filter_options_defaults.transform_values do |value|
+    filter_options.merge! options
+    filter_options.merge! kwargs
+  end
+
+  def filter_options
+    @filter_options ||= filter_options_defaults.transform_values do |value|
       if value.is_a? Proc
         value.call self
       else
         value
       end
     end
-
-    filter_options.reverse_merge! applied_filter_options_defaults
-    filter_options.reverse_merge! options
-    filter_options.reverse_merge! kwargs
-  end
-
-  def filter_options
-    @filter_options ||= {}
   end
 end
 

data/lib/graphql/filters/input_types/fields_comparison_input_type.rb

@@ -21,7 +21,7 @@ module GraphQL
                        required: false,
                        prepare: lambda { |field_comparator, _context|
                          lambda { |scope|
-                           if scope.klass.attribute_names.include? filter_options[:attribute_name]
+                           if scope.klass.attribute_names.include? filter_options[:attribute_name].to_s
                              field_comparator.call scope, filter_options[:attribute_name]
                            else
                              field_comparator.call scope, filter_options[:association_name]

data/lib/graphql/filters/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Filters
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-filters
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Moku S.r.l.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord