hq-graphql 2.1.7 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb02d8ac286808a6ec7c77a888691740036aedb2e570b0cd493ffd52723ecbae
-  data.tar.gz: 84aac61cd4de7dc2d38fa9e325efade24f06c892db0a9fd89f0fa9ca96d43340
+  metadata.gz: 34f3a14ee58de081c8d52088ebc7986cbc2ccf597392015bcb44aa629aef6556
+  data.tar.gz: 39a436fca18cae2f81e672e78ae3118c4893512781a594c24d086cbf0f7e00c1
 SHA512:
-  metadata.gz: 0a8ff7468d91f94463b8311daa52468229414193982b1e110ab80ded645780792086c15f4a96844761c276e0f4916af36309cc3dc9749967c677a342ebd669f7
-  data.tar.gz: 8b4342e2b679c368941ee81ded4d3f4b4946576a7e6f65c2fd16bd830257233de7123f170068f262bc17d0b9fe1b0de179252624a23204c7312590d6e401f5ba
+  metadata.gz: '09606ace844e47c5c414a73d1f3b2ffd7a7183b173090ade1e6287bc42aa6cc84eed691dd3d3a2b8d7ad4f8045779550f619fab017ed0dd79c49621c007ad9d1'
+  data.tar.gz: d8a07ccf03a311b807c7669202ce54d64e89db640f15911f2a1c6ddc3237d9fa94410e8527ae70539659a86ca06cf89317409b00d98b589056b9d6db5ae80dfc

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
@@ -18,6 +18,15 @@ Define a global default scope.
 end
 ```
 
+### Excluded Inputs
+Define a global excluded input fields. Useful for excluding (autogenerated | auto set) fields like below.
+
+```ruby
+::HQ::GraphQL.configure do |config|
+  config.excluded_inputs = [:id, :created_at, :updated_at]
+end
+```
+
 ## GraphQL Resource
 Connect to ActiveRecord to auto generate queries and mutations.
 

data/lib/hq/graphql.rb

@@ -36,6 +36,10 @@ module HQ
       config.extract_class.call(klass)
     end
 
+    def self.excluded_inputs
+      config.excluded_inputs || []
+    end
+
     def self.lookup_resource(klass)
       [klass, klass.base_class, klass.superclass].lazy.map do |k|
         config.resource_lookup.call(k) || resources.detect { |r| r.model_klass == k }

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

@@ -10,6 +10,7 @@ module HQ
       :extract_class,
       :resource_lookup,
       :use_experimental_associations,
+      :excluded_inputs,
       keyword_init: true
     )
       def initialize(

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

@@ -32,19 +32,21 @@ module HQ
       end
 
       #### Class Methods ####
-      def self.with_model(model_name, attributes: true, associations: false, enums: true)
+      def self.with_model(model_name, attributes: true, associations: false, enums: true, excluded_inputs: [])
         self.model_name = model_name
         self.auto_load_attributes = attributes
         self.auto_load_associations = associations
         self.auto_load_enums = enums
 
         lazy_load do
+          excluded_inputs += ::HQ::GraphQL.excluded_inputs
+
           model_columns.each do |column|
-            argument_from_column(column)
+            argument_from_column(column) unless excluded_inputs.include?(column.name.to_sym)
           end
 
           model_associations.each do |association|
-            argument_from_association association
+            argument_from_association(association) unless excluded_inputs.include?(association.name.to_sym)
           end
 
           argument :X, String, required: false
@@ -67,6 +69,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 +90,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,14 +95,22 @@ 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|
-            next unless validation.class == ActiveRecord::Validations::PresenceValidator
+          !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.options.include?(:if) || validation.options.include?(:unless))
             validation.attributes.any? { |a| a.to_s == association.name.to_s }
           end
         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/resource.rb

@@ -108,6 +108,10 @@ module HQ
           self.sort_fields_enum = fields
         end
 
+        def excluded_inputs(*fields)
+          @excluded_inputs = fields
+        end
+
         def def_root(field_name, is_array: false, null: true, &block)
           resource = self
           resolver = -> {
@@ -181,10 +185,12 @@ module HQ
         def build_input_object(**options, &block)
           scoped_graphql_name = graphql_name
           scoped_model_name = model_name
+          scoped_excluded_inputs = @excluded_inputs || []
+
           Class.new(::HQ::GraphQL::InputObject) do
             graphql_name "#{scoped_graphql_name}Input"
 
-            with_model scoped_model_name, **options
+            with_model scoped_model_name, excluded_inputs: scoped_excluded_inputs, **options
 
             class_eval(&block) if block
           end

data/lib/hq/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module HQ
   module GraphQL
-    VERSION = "2.1.7"
+    VERSION = "2.1.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.12
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -285,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:
   - - ">="