hq-graphql 2.1.5 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212005e9fc2e97777c5853273618ff5608c310db175324ac75a2e594cb3fa862
-  data.tar.gz: 2b656d56fee16a199bc865370fcdaa4f3460414909b07b2086d9df82c56d2738
+  metadata.gz: 9dd3d2f47411b616e76f20e118b4a959af58a13223b5d8e758bb35919c5b2b02
+  data.tar.gz: 781c03507b71570f5e9c6b9dc34117f34649097d1e4026701fd740c78209acad
 SHA512:
-  metadata.gz: 65e69ef87752fcd9322b06001fb8bd5dd91e7e6e234c43738776681c96d333d7729d3de88118ac1e7829b24d2c139aa71cb3affb055def6a5a63a63af3379079
-  data.tar.gz: 42016b3a7db045b5a768abb5217b9e68baf6b1d8b29e25b758f25c2c559190d2569671a297c0bf423518dae1f20130541904f87b74608105279a237a3677b8ad
+  metadata.gz: f5be4f443b74567f67e082cec1ae52d83f3adb0b2ae7964afb2f49e74467ed0185c04f34f363f3a0bb153e97bf90c7d8eff2e831d9d137cb1ca7c669b9af2ac8
+  data.tar.gz: aecd6fcaf3f269d0bf2d7504cdebf4e022fd5e4c670d9ad5153f1658d127ba12ca0661711d7cfd1863615d0b94b7ab2098dd5d8e22a8fbb7271a41f5f5a89da5

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/active_record_extensions.rb

@@ -124,6 +124,10 @@ module HQ
           @removed_associations ||= []
         end
 
+        def camelize(name)
+          name.to_s.camelize(:lower)
+        end
+
         def is_enum?(association)
           ::HQ::GraphQL.enums.include?(association.klass)
         end

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/input_object.rb

@@ -67,6 +67,7 @@ module HQ
           is_enum = is_enum?(association)
           input_or_type = is_enum ? ::HQ::GraphQL::Types[association.klass] : ::HQ::GraphQL::Inputs[association.klass]
           name = association.name
+          return if argument_exists?(name)
 
           case association.macro
           when :has_many
@@ -87,7 +88,13 @@ module HQ
         end
 
         def argument_from_column(column)
-          argument column.name, ::HQ::GraphQL::Types.type_from_column(column), required: false
+          name = column.name
+          return if argument_exists?(name)
+          argument name, ::HQ::GraphQL::Types.type_from_column(column), required: false
+        end
+
+        def argument_exists?(name)
+          !!arguments[camelize(name)]
         end
       end
     end

data/lib/hq/graphql/object.rb

@@ -65,7 +65,7 @@ module HQ
         def field_from_association(association, auto_nil:, internal_association: false, &block)
           association_klass = association.klass
           name              = association.name.to_s
-          return if fields[name]
+          return if field_exists?(name)
 
           klass = model_klass
           type  = Types[association_klass]
@@ -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
@@ -91,13 +95,21 @@ module HQ
 
         def field_from_column(column, auto_nil:)
           name = column.name
-          return if fields[name]
+          return if field_exists?(name)
 
           field name, Types.type_from_column(column), null: !auto_nil || column.null
         end
 
+        def field_exists?(name)
+          !!fields[camelize(name)]
+        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

@@ -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.5"
+    VERSION = "2.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.10
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-09-01 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:
   - - ">="