graphql-rails-api 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7801279a80cf36fceb00b2c734cda2ff89e0c695fa77efa10e706e10fb708b
-  data.tar.gz: e0fa94077d38b530f56617ccf14825f330d427c510bf44259f43baf2d28ffc8a
+  metadata.gz: dfe867c4f64d230748b3d8a9d1aece95a16c6692d96491fd67298ad522ddd5ce
+  data.tar.gz: 0a407e15eff08e02e8a202da0d47d3fe6116af42eb591421e3b5a914964f7a48
 SHA512:
-  metadata.gz: 45940578253a9645e325860234d793dc8c00c7fdb69c5758748f45fe66d09c32f08e43d60b3180537953dead3f2b5edf470fe2516cf40a5ed0a237124cd3df8e
-  data.tar.gz: 3f830d57e8ae131cae74735ba29ea24e3a8b2391899aea329b18aec18fc3b75647e3d085201211c514fd6d397dba1739ae0471f0ea906e0650c6214fbcf429ee
+  metadata.gz: e508676774b519da77b95483e1a0d28a91e1843925dc1669f674cb958d911ada161968923a385d86af51b86d47af56baecff3fe5a959cb1b727aed556834df6c
+  data.tar.gz: 3e1aefb503057898ba28eb3008fd2e8b4c63f792fd530ac0a3bcfdf8754ed168a5b5f7f6c1dbaf76f96961494bd03da7f905fc57ba19ccaabd26af1eb8dddffc

data/lib/graphql/hydrate_query.rb

@@ -40,7 +40,7 @@ module Graphql
       transform_filter if @filter.present?
       transform_order if @order_by.present?
 
-      @total = @model.length
+      @total = @model.count
       @model = @model.limit(@per_page)
       @model = @model.offset(@per_page * (@page - 1))
 
@@ -48,7 +48,7 @@ module Graphql
         data: deep_pluck_to_structs(@context&.irep_node&.typed_children&.values&.first.try(:[], "data")),
         total_count: @total,
         per_page: @per_page,
-        page: @page,
+        page: @page
       )
     end
 
@@ -72,10 +72,10 @@ module Graphql
         ordered_field = "#{model_name.pluralize}.#{column}"
       end
 
-      if %i[string text].include?(field_type)
-        @model = @model.order(Arel.sql("upper(#{ordered_field}) #{sign}"))
+      @model = if %i[string text].include?(field_type)
+        @model.order(Arel.sql("upper(#{ordered_field}) #{sign}"))
       else
-        @model = @model.order(Arel.sql("#{ordered_field} #{sign}"))
+        @model.order(Arel.sql("#{ordered_field} #{sign}"))
       end
     end
 
@@ -93,33 +93,32 @@ module Graphql
       if @need_distinct_results
         @model = @model.distinct
       end
-
     rescue RKelly::SyntaxError => e
       raise GraphQL::ExecutionError, "Invalid filter: #{e.message}"
     end
 
     def handle_node(node, model)
-      if node.class == RKelly::Nodes::ParentheticalNode
+      if node.instance_of?(RKelly::Nodes::ParentheticalNode)
         handle_ParentheticalNode(node, model)
-      elsif node.class == RKelly::Nodes::LogicalAndNode
+      elsif node.instance_of?(RKelly::Nodes::LogicalAndNode)
         handle_LogicalAndNode(node, model)
-      elsif node.class == RKelly::Nodes::LogicalOrNode
+      elsif node.instance_of?(RKelly::Nodes::LogicalOrNode)
         handle_LogicalOrNode(node, model)
-      elsif node.class == RKelly::Nodes::NotEqualNode
+      elsif node.instance_of?(RKelly::Nodes::NotEqualNode)
         handle_NotEqualNode(node, model)
-      elsif node.class == RKelly::Nodes::EqualNode
+      elsif node.instance_of?(RKelly::Nodes::EqualNode)
         handle_EqualNode(node, model)
-      elsif node.class == RKelly::Nodes::StrictEqualNode
+      elsif node.instance_of?(RKelly::Nodes::StrictEqualNode)
         handle_StrictEqualNode(node, model)
-      elsif node.class == RKelly::Nodes::NotStrictEqualNode
+      elsif node.instance_of?(RKelly::Nodes::NotStrictEqualNode)
         handle_NotStrictEqualNode(node, model)
-      elsif node.class == RKelly::Nodes::GreaterOrEqualNode
+      elsif node.instance_of?(RKelly::Nodes::GreaterOrEqualNode)
         handle_GreaterOrEqualNode(node, model)
-      elsif node.class == RKelly::Nodes::LessOrEqualNode
+      elsif node.instance_of?(RKelly::Nodes::LessOrEqualNode)
         handle_LessOrEqualNode(node, model)
-      elsif node.class == RKelly::Nodes::LessNode
+      elsif node.instance_of?(RKelly::Nodes::LessNode)
         handle_LessNode(node, model)
-      elsif node.class == RKelly::Nodes::GreaterNode
+      elsif node.instance_of?(RKelly::Nodes::GreaterNode)
         handle_GreaterNode(node, model)
       else
         raise GraphQL::ExecutionError, "Invalid filter: #{node.class} unknown operator"
@@ -162,9 +161,9 @@ module Graphql
     end
 
     def handle_operator_node(node, model)
-      if node.left.class == RKelly::Nodes::DotAccessorNode
+      if node.left.instance_of?(RKelly::Nodes::DotAccessorNode)
         handle_dot_accessor_node(node, model)
-      elsif node.left.class == RKelly::Nodes::ResolveNode
+      elsif node.left.instance_of?(RKelly::Nodes::ResolveNode)
         handle_resolve_node(node, model)
       else
         raise GraphQL::ExecutionError, "Invalid left value: #{node.left.class}"
@@ -172,7 +171,7 @@ module Graphql
     end
 
     def value_from_node(node, sym_type, sym, model)
-      if node.class == RKelly::Nodes::StringNode
+      if node.instance_of?(RKelly::Nodes::StringNode)
         val = node.value.gsub(/^'|'$|^"|"$/, "")
         if sym_type == :datetime
           DateTime.parse(val)
@@ -190,13 +189,13 @@ module Graphql
         else
           val
         end
-      elsif node.class == RKelly::Nodes::NumberNode
+      elsif node.instance_of?(RKelly::Nodes::NumberNode)
         node.value
-      elsif node.class == RKelly::Nodes::TrueNode
+      elsif node.instance_of?(RKelly::Nodes::TrueNode)
         true
-      elsif node.class == RKelly::Nodes::FalseNode
+      elsif node.instance_of?(RKelly::Nodes::FalseNode)
         false
-      elsif node.class == RKelly::Nodes::NullNode
+      elsif node.instance_of?(RKelly::Nodes::NullNode)
         nil
       else
         raise GraphQL::ExecutionError, "Invalid filter: #{node} unknown rvalue node"
@@ -204,7 +203,7 @@ module Graphql
     end
 
     def sanitize_sql_like(value)
-      ActiveRecord::Base::sanitize_sql_like(value)
+      ActiveRecord::Base.sanitize_sql_like(value)
     end
 
     def handle_NotEqualNode(node, model)
@@ -335,7 +334,7 @@ module Graphql
         next arr << v if parent_class.new.attributes.key?(v)
 
         klass = evaluate_model(parent_class, k)
-        arr << { k.to_sym => hash_to_array_of_hashes(v, klass) } if klass.present? && v.present?
+        arr << {k.to_sym => hash_to_array_of_hashes(v, klass)} if klass.present? && v.present?
       end
     end
 
@@ -343,7 +342,7 @@ module Graphql
       hash.select { |k, _| k.ends_with?("_ids") }.each do |(k, _)|
         collection_name = k.gsub("_ids", "").pluralize
         if hash[collection_name].blank?
-          hash[collection_name] = { "id" => nil }
+          hash[collection_name] = {"id" => nil}
         else
           hash[collection_name]["id"] = nil
         end

data/lib/graphql/rails/api/version.rb

@@ -1,7 +1,7 @@
 module Graphql
   module Rails
     module Api
-      VERSION = '0.9.2'.freeze
+      VERSION = "0.9.3".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql