hq-graphql 2.1.3 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ee2af7af4309a1fb549c15b88abdb8bda3454eacfdce5136f1997b814c52fb
-  data.tar.gz: 9dc0b893d4ad8bf8a999cba996224488be9c394e55f83ef979460ac19f96c381
+  metadata.gz: 2b3620be84fad5d620dfb18c0f51bd0cf726671b49320ec1910bd534ef31d569
+  data.tar.gz: 8974a6d0e3aa4dd0ad5e1dd37b0802c8b70d428365abfdb3342da4fffe66a0cb
 SHA512:
-  metadata.gz: f4940761bdccfd01c867e21f69ab66a5459d8b151024ebd79679906ea62fa6c5d2208ce311a339ed720021c2b43221e51ebb092de8f4bff87a15bc3e3f07f376
-  data.tar.gz: 00a7683630411f065d954132918b3449ef6aec9419de30702dd43bf99ad34fb8dbaf5ee1ae248759f3029006db3863257fe86a99d7b89a7456123c82d52ef7b3
+  metadata.gz: c67704e43e662552da1818d5f53fcd5acd3bb38da62fb556fac427d590bf002906e58a4a39d7141bc33f22c689c76c9fb1b33cf7b155f9590df0ea9ba8f056b6
+  data.tar.gz: f82c433ab64e9e5d34cb62f51464811621242de62220294766107fe96ad75cbaa665b69a4c99042f5a063c9f22106c1a980dbeee037de3c3e7353c4dd2cd41d0

data/lib/hq/graphql.rb

@@ -77,6 +77,7 @@ require "hq/graphql/input_object"
 require "hq/graphql/mutation"
 require "hq/graphql/object"
 require "hq/graphql/paginated_association_loader"
+require "hq/graphql/record_loader"
 require "hq/graphql/resource"
 require "hq/graphql/root_mutation"
 require "hq/graphql/root_query"

data/lib/hq/graphql/enum.rb

@@ -34,6 +34,7 @@ module HQ::GraphQL
       prefix: nil,
       register: true,
       scope: nil,
+      strip: /(^[^_a-zA-Z])|([^_a-zA-Z0-9]*)/,
       value_method: :name
     )
       raise ArgumentError.new(<<~ERROR) if !klass
@@ -49,7 +50,7 @@ module HQ::GraphQL
       lazy_load do
         records = scope ? klass.instance_exec(&scope) : klass.all
         records.each do |record|
-          value "#{prefix}#{record.send(value_method).delete(" ")}", value: record
+          value "#{prefix}#{record.send(value_method).gsub(strip, "")}", value: record
         end
       end
     end

data/lib/hq/graphql/object.rb

@@ -64,9 +64,11 @@ module HQ
 
         def field_from_association(association, auto_nil:, internal_association: false, &block)
           association_klass = association.klass
-          name              = association.name
-          klass             = model_klass
-          type              = Types[association_klass]
+          name              = association.name.to_s
+          return if fields[name]
+
+          klass = model_klass
+          type  = Types[association_klass]
           case association.macro
           when :has_many
             field name, [type], null: false, klass: model_name do
@@ -88,7 +90,10 @@ module HQ
         end
 
         def field_from_column(column, auto_nil:)
-          field column.name, Types.type_from_column(column), null: !auto_nil || column.null
+          name = column.name
+          return if fields[name]
+
+          field name, Types.type_from_column(column), null: !auto_nil || column.null
         end
 
         def association_required?(association)

data/lib/hq/graphql/paginated_association_loader.rb

@@ -23,7 +23,7 @@ module HQ
         @limit                = [0, limit].max if limit
         @offset               = [0, offset].max if offset
         @scope                = scope
-        @sort_by              = sort_by || :updated_at
+        @sort_by              = sort_by || :created_at
         @sort_order           = normalize_sort_order(sort_order)
 
         validate!
@@ -64,7 +64,6 @@ module HQ
 
             inside_scope = default_scope.
               select(inner_table[::Arel.star]).
-              from(inner_table).
               where(lateral_join_table[target_join_key].eq(from_table[target_join_key])).
               reorder(arel_order(inner_table)).
               limit(@limit).

data/lib/hq/graphql/record_loader.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module HQ
+  module GraphQL
+    class RecordLoader < ::GraphQL::Batch::Loader
+      def initialize(model, column: model.primary_key, where: nil)
+        @model = model
+        @column = column.to_s
+        @column_type = model.type_for_attribute(@column)
+        @where = where
+      end
+
+      def load(key)
+        super(@column_type.cast(key))
+      end
+
+      def perform(keys)
+        query(keys).each { |record| fulfill(record.public_send(@column), record) }
+        keys.each { |key| fulfill(key, nil) unless fulfilled?(key) }
+      end
+
+      private
+
+      def query(keys)
+        scope = @model
+        scope = scope.where(@where) if @where
+        scope.where(@column => keys)
+      end
+    end
+  end
+end

data/lib/hq/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module HQ
   module GraphQL
-    VERSION = "2.1.3"
+    VERSION = "2.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.8
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,7 @@ files:
 - lib/hq/graphql/object.rb
 - lib/hq/graphql/object_association.rb
 - lib/hq/graphql/paginated_association_loader.rb
+- lib/hq/graphql/record_loader.rb
 - lib/hq/graphql/resource.rb
 - lib/hq/graphql/resource/auto_mutation.rb
 - lib/hq/graphql/root_mutation.rb