hq-graphql 2.1.10 → 2.2.2

data/lib/hq/graphql/resource/auto_mutation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require "hq/graphql/ext/mutation_extensions"
 require "hq/graphql/inputs"
-require "hq/graphql/mutation"
 require "hq/graphql/types"
 
 module HQ
@@ -130,15 +130,16 @@ module HQ
         def build_mutation(action:, require_primary_key: false, nil_klass: false, &block)
           gql_name = "#{graphql_name}#{action.to_s.titleize}"
           scoped_model_name = model_name
-          Class.new(::HQ::GraphQL::Mutation) do
+
+          klass = Class.new(::GraphQL::Schema::Mutation) do
             graphql_name gql_name
 
-            define_method(:ready?) do |*args|
-              super(*args) && ::HQ::GraphQL.authorized?(action, scoped_model_name, context)
+            define_method(:ready?) do |**args|
+              super(**args) && ::HQ::GraphQL.authorized?(action, scoped_model_name, context)
             end
 
             lazy_load do
-              field :errors, ::HQ::GraphQL::Types::Object, null: false
+              field :errors, ::GraphQL::Types::JSON, null: false
               field :resource, ::HQ::GraphQL::Types[scoped_model_name, nil_klass], null: true
             end
 
@@ -156,6 +157,8 @@ module HQ
               resource.errors.to_h.deep_transform_keys { |k| k.to_s.camelize(:lower) }
             end
           end
+
+          const_set(gql_name, klass)
         end
       end
     end

data/lib/hq/graphql/root_mutation.rb

@@ -2,7 +2,7 @@
 
 module HQ
   module GraphQL
-    class RootMutation < ::HQ::GraphQL::Object
+    class RootMutation < ::GraphQL::Schema::Object
       def self.inherited(base)
         super
         base.class_eval do

data/lib/hq/graphql/root_query.rb

@@ -2,13 +2,13 @@
 
 module HQ
   module GraphQL
-    class RootQuery < ::HQ::GraphQL::Object
+    class RootQuery < ::GraphQL::Schema::Object
       def self.inherited(base)
         super
         base.class_eval do
           lazy_load do
-            ::HQ::GraphQL.root_queries.each do |field_name:, resolver:, model_name:|
-              field field_name, resolver: resolver.call, klass: model_name
+            ::HQ::GraphQL.root_queries.each do |query|
+              field query[:field_name], resolver: query[:resolver].call, klass: query[:model_name]
             end
           end
         end

data/lib/hq/graphql/scalars.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "hq/graphql/types/object"
 require "hq/graphql/types/uuid"
 
 module HQ
   module GraphQL
     module Scalars
-      Object = ::HQ::GraphQL::Types::Object
       UUID = ::HQ::GraphQL::Types::UUID
     end
   end

data/lib/hq/graphql/types.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "hq/graphql/types/object"
 require "hq/graphql/types/uuid"
 
 module HQ
@@ -35,7 +34,7 @@ module HQ
           when :uuid
             ::HQ::GraphQL::Types::UUID
           when :json, :jsonb
-            ::HQ::GraphQL::Types::Object
+            ::GraphQL::Types::JSON
           when :integer
             ::GraphQL::Types::Int
           when :decimal

data/lib/hq/graphql/types/uuid.rb

@@ -26,7 +26,7 @@ module HQ
           end
 
           def validate_uuid(value)
-            !!value.to_s.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+            !value || !!value.to_s.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
           end
         end
       end

data/lib/hq/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module HQ
   module GraphQL
-    VERSION = "2.1.10"
+    VERSION = "2.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.2.2
 platform: ruby
 authors:
 - Danny Jones
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.6
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: graphql-batch
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -182,30 +168,30 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0beta2
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0beta2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -246,22 +232,24 @@ files:
 - Rakefile
 - lib/hq-graphql.rb
 - lib/hq/graphql.rb
-- lib/hq/graphql/active_record_extensions.rb
 - lib/hq/graphql/association_loader.rb
 - lib/hq/graphql/comparator.rb
 - lib/hq/graphql/config.rb
 - lib/hq/graphql/engine.rb
-- lib/hq/graphql/enum.rb
 - lib/hq/graphql/enum/sort_by.rb
 - lib/hq/graphql/enum/sort_order.rb
+- lib/hq/graphql/ext.rb
+- lib/hq/graphql/ext/active_record_extensions.rb
+- lib/hq/graphql/ext/enum_extensions.rb
+- lib/hq/graphql/ext/input_object_extensions.rb
+- lib/hq/graphql/ext/mutation_extensions.rb
+- lib/hq/graphql/ext/object_extensions.rb
+- lib/hq/graphql/ext/schema_extensions.rb
 - lib/hq/graphql/field.rb
 - lib/hq/graphql/field_extension/association_loader_extension.rb
 - lib/hq/graphql/field_extension/paginated_arguments.rb
 - lib/hq/graphql/field_extension/paginated_loader.rb
-- lib/hq/graphql/input_object.rb
 - lib/hq/graphql/inputs.rb
-- lib/hq/graphql/mutation.rb
-- lib/hq/graphql/object.rb
 - lib/hq/graphql/object_association.rb
 - lib/hq/graphql/paginated_association_loader.rb
 - lib/hq/graphql/record_loader.rb
@@ -270,22 +258,20 @@ files:
 - lib/hq/graphql/root_mutation.rb
 - lib/hq/graphql/root_query.rb
 - lib/hq/graphql/scalars.rb
-- lib/hq/graphql/schema.rb
 - lib/hq/graphql/types.rb
-- lib/hq/graphql/types/object.rb
 - lib/hq/graphql/types/uuid.rb
 - lib/hq/graphql/version.rb
 homepage: https://github.com/OneHQ/hq-graphql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -294,8 +280,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: OneHQ GraphQL Library
 test_files: []

data/lib/hq/graphql/active_record_extensions.rb

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-module HQ
-  module GraphQL
-    module ActiveRecordExtensions
-      class Error < StandardError
-        MISSING_MODEL_MSG = "Your GraphQL object must be connected to a model: `::HQ::GraphQL::Object.with_model 'User'`"
-        MISSING_ATTR_MSG = "Can't find attr %{model}.%{attr}'`"
-        MISSING_ASSOC_MSG = "Can't find association %{model}.%{assoc}'`"
-      end
-
-      def self.included(klass)
-        klass.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        attr_accessor :model_name,
-                      :authorize_action,
-                      :auto_load_attributes,
-                      :auto_load_associations,
-                      :auto_load_enums
-
-        def lazy_load(&block)
-          @lazy_load ||= []
-          @lazy_load << block if block
-          @lazy_load
-        end
-
-        def lazy_load!
-          lazy_load.each(&:call)
-          @lazy_load = []
-        end
-
-        def model_columns
-          model_columns =
-            if auto_load_attributes
-              model_klass.columns
-            else
-              added_attributes.map { |attr| column_from_model(attr) }
-            end
-
-          # validate removed_attributes exist
-          removed_attributes.each { |attr| column_from_model(attr) }
-
-          model_columns.reject { |c| removed_attributes.include?(c.name.to_sym) }.sort_by(&:name)
-        end
-
-        def model_associations
-          model_associations = []
-          enums = model_klass.reflect_on_all_associations.select { |a| is_enum?(a) }
-          associatons = model_klass.reflect_on_all_associations - enums
-
-          if auto_load_enums
-            model_associations.concat(enums)
-          end
-
-          if auto_load_associations
-            model_associations.concat(associatons)
-          end
-
-          model_associations.concat(added_associations.map { |association| association_from_model(association) }).uniq
-
-          # validate removed_associations exist
-          removed_associations.each { |association| association_from_model(association) }
-
-          model_associations.reject { |a| removed_associations.include?(a.name.to_sym) }.sort_by(&:name)
-        end
-
-        private
-
-        def add_attributes(*attrs)
-          validate_model!
-          added_attributes.concat attrs.map(&:to_sym)
-        end
-        alias_method :add_attribute, :add_attributes
-        alias_method :add_attrs, :add_attributes
-        alias_method :add_attr, :add_attributes
-
-        def remove_attributes(*attrs)
-          validate_model!
-          removed_attributes.concat attrs.map(&:to_sym)
-        end
-        alias_method :remove_attribute, :remove_attributes
-        alias_method :remove_attrs, :remove_attributes
-        alias_method :remove_attr, :remove_attributes
-
-        def add_associations(*associations)
-          validate_model!
-          added_associations.concat associations.map(&:to_sym)
-        end
-        alias_method :add_association, :add_associations
-
-        def remove_associations(*associations)
-          validate_model!
-          removed_associations.concat associations.map(&:to_sym)
-        end
-        alias_method :remove_association, :remove_associations
-
-        def model_klass
-          @model_klass ||= model_name.constantize
-        end
-
-        def column_from_model(attr)
-          model_klass.columns_hash[attr.to_s] || raise(Error, Error::MISSING_ATTR_MSG % { model: model_name, attr: attr })
-        end
-
-        def association_from_model(association)
-          model_klass.reflect_on_association(association) || raise(Error, Error::MISSING_ASSOC_MSG % { model: model_name, assoc: association })
-        end
-
-        def added_attributes
-          @added_attributes ||= []
-        end
-
-        def removed_attributes
-          @removed_attributes ||= []
-        end
-
-        def added_associations
-          @added_associations ||= []
-        end
-
-        def removed_associations
-          @removed_associations ||= []
-        end
-
-        def camelize(name)
-          name.to_s.camelize(:lower)
-        end
-
-        def is_enum?(association)
-          ::HQ::GraphQL.enums.include?(association.klass)
-        end
-
-        def validate_model!
-          lazy_load do
-            model_name || raise(Error, Error::MISSING_MODEL_MSG)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hq/graphql/enum.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require "hq/graphql/types"
-
-module HQ::GraphQL
-  class Enum < ::GraphQL::Schema::Enum
-    ## Auto generate enums from the database using ActiveRecord
-    #  This comes in handy when we have constants that we want represented as enums.
-    #
-    # == Example
-    #   Let's assume we're saving data into a user types table
-    #     # select * from user_types;
-    #      id |    name
-    #     --- +-------------
-    #      1  | Admin
-    #      2  | Support User
-    #     (2 rows)
-    #
-    #  ```ruby
-    #    class Enums::UserType < ::HQ::GraphQL::Enum
-    #      with_model
-    #    end
-    #  ```
-    #
-    #  Creates the following enum:
-    #  ```graphql
-    #    enum UserType {
-    #      Admin
-    #      SupportUser
-    #    }
-    #  ```
-    def self.with_model(
-      klass = default_model_name.safe_constantize,
-      prefix: nil,
-      register: true,
-      scope: nil,
-      strip: /(^[^_a-zA-Z])|([^_a-zA-Z0-9]*)/,
-      value_method: :name
-    )
-      raise ArgumentError.new(<<~ERROR) if !klass
-        `::HQ::GraphQL::Enum.with_model {...}' had trouble automatically inferring the class name.
-        Avoid this by manually passing in the class name: `::HQ::GraphQL::Enum.with_model(#{default_model_name}) {...}`
-      ERROR
-
-      if register
-        ::HQ::GraphQL.enums << klass
-        ::HQ::GraphQL::Types.register(klass, self)
-      end
-
-      lazy_load do
-        records = scope ? klass.instance_exec(&scope) : klass.all
-        records.each do |record|
-          value "#{prefix}#{record.send(value_method).gsub(strip, "")}", value: record
-        end
-      end
-    end
-
-    def self.lazy_load(&block)
-      @lazy_load ||= []
-      @lazy_load << block if block
-      @lazy_load
-    end
-
-    def self.lazy_load!
-      lazy_load.map(&:call)
-      @lazy_load = []
-    end
-
-    def self.to_graphql
-      lazy_load!
-      super
-    end
-
-    def self.default_model_name
-      to_s.sub(/^((::)?\w+)::/, "")
-    end
-  end
-end