graphql-rails-api 0.9.2 → 0.9.3.pre.fix

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7801279a80cf36fceb00b2c734cda2ff89e0c695fa77efa10e706e10fb708b
-  data.tar.gz: e0fa94077d38b530f56617ccf14825f330d427c510bf44259f43baf2d28ffc8a
+  metadata.gz: 28fb07b00c4ddc6fab6260937a8ab6b5edd025ae6703ab2334a3fba30e56619c
+  data.tar.gz: 5991b8d3475a620d0c4a0a6106795b8559123cfc65faf6f9cb3a5f44292778ec
 SHA512:
-  metadata.gz: 45940578253a9645e325860234d793dc8c00c7fdb69c5758748f45fe66d09c32f08e43d60b3180537953dead3f2b5edf470fe2516cf40a5ed0a237124cd3df8e
-  data.tar.gz: 3f830d57e8ae131cae74735ba29ea24e3a8b2391899aea329b18aec18fc3b75647e3d085201211c514fd6d397dba1739ae0471f0ea906e0650c6214fbcf429ee
+  metadata.gz: 95f60329781d38bf3275a24617868a2baa0fa82812fb4ecd5b79c36f45bbc9ad69a8f98270c797d76df384719417a60fb27a6cd31350c5fb1baa1ceecaae9ceb
+  data.tar.gz: 9c76d727e713a14110ea7e77314f446d5c996719abacd228f05202c8c1b7f379e9c1bdb2e67bdc6173bcfc2a6a84a704de6e32d60dd4155f68f769619aaeb822

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
 
@@ -57,25 +57,28 @@ module Graphql
     def transform_order
       return if @order_by.blank?
 
-      sign = @order_by.split(" ").last.downcase == "desc" ? "desc" : "asc"
-      column = @order_by.split(" ").first.strip
+      @order_by.split(",").each do |order|
 
-      if column.include?(".")
-        associated_model = column.split(".").first
-        accessor = column.split(".").last
-        assoc = get_assoc!(@model, associated_model)
-        field_type = get_field_type!(assoc.klass, accessor)
-        @model = @model.left_joins(associated_model.to_sym)
-        ordered_field = "#{associated_model.pluralize}.#{accessor}"
-      else
-        field_type = get_field_type!(@model, column)
-        ordered_field = "#{model_name.pluralize}.#{column}"
-      end
+        sign = order.split(" ").last.downcase == "desc" ? "desc" : "asc"
+        column = order.split(" ").first.strip
 
-      if %i[string text].include?(field_type)
-        @model = @model.order(Arel.sql("upper(#{ordered_field}) #{sign}"))
-      else
-        @model = @model.order(Arel.sql("#{ordered_field} #{sign}"))
+        if column.include?(".")
+          associated_model = column.split(".").first
+          accessor = column.split(".").last
+          assoc = get_assoc!(@model, associated_model)
+          field_type = get_field_type!(assoc.klass, accessor)
+          @model = @model.left_joins(associated_model.to_sym)
+          ordered_field = "#{associated_model.pluralize}.#{accessor}"
+        else
+          field_type = get_field_type!(@model, column)
+          ordered_field = "#{model_name.pluralize}.#{column}"
+        end
+
+        @model = if %i[string text].include?(field_type)
+          @model.order(Arel.sql("upper(#{ordered_field}) #{sign}"))
+        else
+          @model.order(Arel.sql("#{ordered_field} #{sign}"))
+        end
       end
     end
 
@@ -93,33 +96,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 +164,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 +174,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 +192,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 +206,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 +337,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 +345,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-fix".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.pre.fix
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -110,11 +110,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Graphql rails api framework to create easily graphql api with rails