hq-graphql 2.1.4 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cffa70521d220d85df139e5dab62fec20a97b121578dea7d5fa6cc0991c46501
-  data.tar.gz: b6d9949097849efdd3002dacfc46fe5bf000830d7c86d47bc8f4bfb743321d5a
+  metadata.gz: 981f1e51c20c41befde482f0ab312887f597727265508b2f8b4290420c91e2e1
+  data.tar.gz: 3038b46301c4b612a99988ba7fe9aa66aadc401a7a8a4ea8a959b3e8c23e8743
 SHA512:
-  metadata.gz: 3d3933664e856fba5c7111dbea3e6fd6fa653aa5ec170ce5ff6a800d07573d5791290745651513a04ae57e1f2171b38b93d48961350b8bc7a5f9af01fffad507
-  data.tar.gz: 4029d92a6198a414fac136c1b87c850aa94ca92e789065cea70c0e31b0c8e3cdaf3578c1b068bfb367d362e0499580223269f3e467773c57e0621e8a3aa627c1
+  metadata.gz: 30e473198ed03eaf14a9a4c9730c2a5816f5914dc745ef1fe0acc0b8e16f6a0b9b1f80bb2861fcb7bec16a5a0860bca1197b54892450686e545ef04f4f141611
+  data.tar.gz: e4b0b57d5674e48fe75ec61de48cf484425b504500b1e201322650211856de5557da6353f95907d77bb41bf0b41ef52c0434349d805dc8b29fec27eb0182c57c

data/README.md

@@ -2,7 +2,7 @@
 
 OneHQ GraphQL interface to [Ruby Graphql](https://github.com/rmosolgo/graphql-ruby).
 
-[![CircleCI](https://img.shields.io/circleci/project/github/OneHQ/hq-graphql.svg)](https://circleci.com/gh/OneHQ/hq-graphql/tree/master)
+![Test and Lint](https://github.com/OneHQ/hq-graphql/workflows/Test%20and%20Lint/badge.svg)
 [![GitHub tag](https://img.shields.io/github/tag/OneHQ/hq-graphql.svg)](https://github.com/OneHQ/hq-graphql)
 
 ## Configuration

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

@@ -80,6 +80,10 @@ module HQ
               end
               instance_eval(&block) if block
             end
+          when :has_one
+            field name, type, null: !auto_nil || !has_presence_validation?(association), klass: model_name do
+              extension FieldExtension::AssociationLoaderExtension, klass: klass
+            end
           else
             field name, type, null: !auto_nil || !association_required?(association), klass: model_name do
               extension FieldExtension::AssociationLoaderExtension, klass: klass
@@ -97,7 +101,11 @@ module HQ
         end
 
         def association_required?(association)
-          !association.options[:optional] || model_klass.validators.any? do |validation|
+          !association.options[:optional] || has_presence_validation?(association)
+        end
+
+        def has_presence_validation?(association)
+          model_klass.validators.any? do |validation|
             next unless validation.class == ActiveRecord::Validations::PresenceValidator
             validation.attributes.any? { |a| a.to_s == association.name.to_s }
           end

data/lib/hq/graphql/object_association.rb

@@ -15,6 +15,11 @@ module HQ
         add_reflection(name, scope, options, :belongs_to, block)
       end
 
+      def has_one(name, scope = nil, through: nil, **options, &block)
+        raise TypeError, "has_one through is unsupported" if through
+        add_reflection(name, scope, options, :has_one, block)
+      end
+
       def has_many(name, scope = nil, through: nil, **options, &block)
         raise TypeError, "has_many through is unsupported" if through
         add_reflection(name, scope, options, :has_many, block)

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.4"
+    VERSION = "2.1.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.9
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-08-11 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
@@ -284,9 +285,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="