graphql_devise 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70b800d06fccce1a1622f391cb5584821983cfda8f333ec44fd457f90e7aeec
-  data.tar.gz: e57b1ba49e7d70175933e27ce6926e2b9b8296c0400d3f182d6f5015b0675901
+  metadata.gz: 2b4803d3f6df2467fd64e37ae4e91e9be33f422600b9fc0a920827313c24c843
+  data.tar.gz: 152da5a17af638e55375f0e5af21246b26e49c107300d556dca7ba8992456666
 SHA512:
-  metadata.gz: 145d52faa01bb66d6fb21de7fc37dfe5e9344e8b02b6c5c0929a54e4ed7e803564bcdabd80c57ec1aab6d5e957a22a7f7c31d1b061c10a321dacac60b3d83a3e
-  data.tar.gz: 26daabadeb5995fe97a86e7f73d049e46e0d272955316695369b8ec078a5baf48b9f8e18fb31ce4cdebd377837b5aa8f84a06c43cbea55f46ba45ff4258e5df0
+  metadata.gz: 33831323626b88ecdcf4805fdc1b097bd66f18af3bebf5319d16dc27a8122672d0666d0d96c638fa4e30f85f1bc24503f2481287eed594bcfa307bce9693eb69
+  data.tar.gz: 50d5b6f84ac02367304dc81ad0609b3c5e013eb5c7eff41d5ac3feb4fa415c205810b27872e856a9b672ed621a66f361b2d61106246bf968134d08eee8524dc1

data/.rubocop.yml

@@ -59,7 +59,7 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: false
 
 Naming/VariableNumber:
-  Enabled: false
+  EnforcedColonStyle: normalcase
 
 Style/StringLiterals:
   ConsistentQuotesInMultiline: true

data/Appraisals

@@ -3,6 +3,7 @@ appraise 'rails4.2-graphql1.8' do
   gem 'bundler', '~> 1.17'
   gem 'rails', github: 'rails/rails', branch: '4-2-stable'
   gem 'graphql', '~> 1.8.0'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.0-graphql1.8' do
@@ -11,12 +12,14 @@ appraise 'rails5.0-graphql1.8' do
   gem 'graphql', '~> 1.8.0'
   gem 'devise_token_auth', '0.1.43'
   gem 'devise', '>= 4.0'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.0-graphql1.9' do
   gem 'sqlite3', '~> 1.3.6'
   gem 'rails', github: 'rails/rails', branch: '5-0-stable'
   gem 'graphql', '~> 1.9.0'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.1-graphql1.8' do
@@ -25,12 +28,14 @@ appraise 'rails5.1-graphql1.8' do
   gem 'graphql', '~> 1.8.0'
   gem 'devise_token_auth', '0.1.43'
   gem 'devise', '>= 4.3'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.1-graphql1.9' do
   gem 'sqlite3', '~> 1.3.6'
   gem 'rails', github: 'rails/rails', branch: '5-1-stable'
   gem 'graphql', '~> 1.9.0'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.2-graphql1.8' do
@@ -39,18 +44,21 @@ appraise 'rails5.2-graphql1.8' do
   gem 'graphql', '~> 1.8.0'
   gem 'devise_token_auth', '0.1.43'
   gem 'devise', '>= 4.4.2'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.2-graphql1.9' do
   gem 'sqlite3', '~> 1.3.6'
   gem 'rails', github: 'rails/rails', branch: '5-2-stable'
   gem 'graphql', '~> 1.9.0'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails5.2-graphql1.10' do
   gem 'sqlite3', '~> 1.3.6'
   gem 'rails', github: 'rails/rails', branch: '5-2-stable'
   gem 'graphql', '~> 1.10.0'
+  gem 'rspec-rails', '< 4.0'
 end
 
 appraise 'rails6.0-graphql1.8' do

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [v0.11.0](https://github.com/graphql-devise/graphql_devise/tree/v0.11.0) (2020-04-11)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.10.1...v0.11.0)
+
+**Breaking changes:**
+
+- Make Authenticatable type not null [\#80](https://github.com/graphql-devise/graphql_devise/pull/80) ([mcelicalderon](https://github.com/mcelicalderon))
+
+**Implemented enhancements:**
+
+- Add mount method option sanitizer [\#78](https://github.com/graphql-devise/graphql_devise/pull/78) ([mcelicalderon](https://github.com/mcelicalderon))
+
+**Fixed bugs:**
+
+- Refactor mount method operations [\#79](https://github.com/graphql-devise/graphql_devise/pull/79) ([mcelicalderon](https://github.com/mcelicalderon))
+- Fix routes GQL ruby \(v1.10.0\) version check [\#74](https://github.com/graphql-devise/graphql_devise/pull/74) ([mcelicalderon](https://github.com/mcelicalderon))
+
 ## [v0.10.1](https://github.com/graphql-devise/graphql_devise/tree/v0.10.1) (2020-03-21)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.10.0...v0.10.1)

data/graphql_devise.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/graphql-devise/graphql_devise'
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|gemfiles)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -37,8 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
+  spec.add_development_dependency 'rspec-rails', '~> 4.0'
   spec.add_development_dependency 'rubocop', '0.68.1'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'

data/lib/graphql_devise.rb

@@ -1,13 +1,29 @@
 require 'rails'
 require 'graphql'
 require 'devise_token_auth'
+
+module GraphqlDevise
+  class Error < StandardError; end
+
+  class InvalidMountOptionsError < GraphqlDevise::Error; end
+end
+
+require 'graphql_devise/concerns/controller_methods'
+require 'graphql_devise/types/authenticatable_type'
+require 'graphql_devise/types/credential_type'
+require 'graphql_devise/types/mutation_type'
+require 'graphql_devise/types/query_type'
+require 'graphql_devise/default_operations/mutations'
+require 'graphql_devise/default_operations/resolvers'
+require 'graphql_devise/resolvers/dummy'
+
 require 'graphql_devise/engine'
 require 'graphql_devise/version'
 require 'graphql_devise/error_codes'
 require 'graphql_devise/user_error'
 require 'graphql_devise/detailed_user_error'
-require 'graphql_devise/concerns/controller_methods'
 
-module GraphqlDevise
-  class Error < StandardError; end
-end
+require 'graphql_devise/mount_method/option_sanitizer'
+require 'graphql_devise/mount_method/options_validator'
+require 'graphql_devise/mount_method/operation_preparer'
+require 'graphql_devise/mount_method/operation_sanitizer'

data/lib/graphql_devise/default_operations/mutations.rb

@@ -0,0 +1,20 @@
+require 'graphql_devise/mutations/base'
+require 'graphql_devise/mutations/login'
+require 'graphql_devise/mutations/logout'
+require 'graphql_devise/mutations/resend_confirmation'
+require 'graphql_devise/mutations/send_password_reset'
+require 'graphql_devise/mutations/sign_up'
+require 'graphql_devise/mutations/update_password'
+
+module GraphqlDevise
+  module DefaultOperations
+    MUTATIONS = {
+      login:               GraphqlDevise::Mutations::Login,
+      logout:              GraphqlDevise::Mutations::Logout,
+      sign_up:             GraphqlDevise::Mutations::SignUp,
+      update_password:     GraphqlDevise::Mutations::UpdatePassword,
+      send_password_reset: GraphqlDevise::Mutations::SendPasswordReset,
+      resend_confirmation: GraphqlDevise::Mutations::ResendConfirmation
+    }.freeze
+  end
+end

data/lib/graphql_devise/default_operations/resolvers.rb

@@ -0,0 +1,12 @@
+require 'graphql_devise/resolvers/base'
+require 'graphql_devise/resolvers/check_password_token'
+require 'graphql_devise/resolvers/confirm_account'
+
+module GraphqlDevise
+  module DefaultOperations
+    QUERIES = {
+      confirm_account:      GraphqlDevise::Resolvers::ConfirmAccount,
+      check_password_token: GraphqlDevise::Resolvers::CheckPasswordToken
+    }.freeze
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparer.rb

@@ -0,0 +1,41 @@
+require_relative 'operation_preparers/gql_name_setter'
+require_relative 'operation_preparers/mutation_field_setter'
+require_relative 'operation_preparers/resolver_type_setter'
+require_relative 'operation_preparers/resource_name_setter'
+require_relative 'operation_preparers/default_operation_preparer'
+require_relative 'operation_preparers/custom_operation_preparer'
+
+module GraphqlDevise
+  module MountMethod
+    class OperationPreparer
+      def initialize(resource:, selected_operations:, preparer:, custom:, additional_operations:)
+        @selected_operations   = selected_operations
+        @preparer              = preparer
+        @mapping_name          = resource.underscore.tr('/', '_')
+        @custom                = custom
+        @additional_operations = additional_operations
+      end
+
+      def call
+        default_operations = OperationPreparers::DefaultOperationPreparer.new(
+          selected_operations: @selected_operations,
+          custom_keys:         @custom.keys,
+          mapping_name:        @mapping_name,
+          preparer:            @preparer
+        ).call
+
+        custom_operations = OperationPreparers::CustomOperationPreparer.new(
+          selected_keys:     @selected_operations.keys,
+          custom_operations: @custom,
+          mapping_name:      @mapping_name
+        ).call
+
+        additional_operations = @additional_operations.each_with_object({}) do |(action, operation), result|
+          result[action] = OperationPreparers::ResourceNameSetter.new(@mapping_name).call(operation)
+        end
+
+        default_operations.merge(custom_operations).merge(additional_operations)
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparers/custom_operation_preparer.rb

@@ -0,0 +1,24 @@
+module GraphqlDevise
+  module MountMethod
+    module OperationPreparers
+      class CustomOperationPreparer
+        def initialize(selected_keys:, custom_operations:, mapping_name:)
+          @selected_keys     = selected_keys
+          @custom_operations = custom_operations
+          @mapping_name      = mapping_name
+        end
+
+        def call
+          @custom_operations.slice(*@selected_keys).each_with_object({}) do |(action, operation), result|
+            mapped_action = "#{@mapping_name}_#{action}"
+
+            result[mapped_action.to_sym] = [
+              OperationPreparers::GqlNameSetter.new(mapped_action),
+              OperationPreparers::ResourceNameSetter.new(@mapping_name)
+            ].reduce(operation) { |prepared_operation, preparer| preparer.call(prepared_operation) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparers/default_operation_preparer.rb

@@ -0,0 +1,32 @@
+module GraphqlDevise
+  module MountMethod
+    module OperationPreparers
+      class DefaultOperationPreparer
+        def initialize(selected_operations:, custom_keys:, mapping_name:, preparer:)
+          @selected_operations = selected_operations
+          @custom_keys         = custom_keys
+          @mapping_name        = mapping_name
+          @preparer            = preparer
+        end
+
+        def call
+          @selected_operations.except(*@custom_keys).each_with_object({}) do |(action, operation), result|
+            mapped_action = "#{@mapping_name}_#{action}"
+
+            result[mapped_action.to_sym] = [
+              OperationPreparers::GqlNameSetter.new(mapped_action),
+              @preparer,
+              OperationPreparers::ResourceNameSetter.new(@mapping_name)
+            ].reduce(child_class(operation)) { |prepared_operation, preparer| preparer.call(prepared_operation) }
+          end
+        end
+
+        private
+
+        def child_class(operation)
+          Class.new(operation)
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparers/gql_name_setter.rb

@@ -0,0 +1,23 @@
+module GraphqlDevise
+  module MountMethod
+    module OperationPreparers
+      class GqlNameSetter
+        def initialize(mapping_name)
+          @mapping_name = mapping_name
+        end
+
+        def call(operation)
+          operation.graphql_name(graphql_name)
+
+          operation
+        end
+
+        private
+
+        def graphql_name
+          @mapping_name.camelize(:upper)
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparers/mutation_field_setter.rb

@@ -0,0 +1,17 @@
+module GraphqlDevise
+  module MountMethod
+    module OperationPreparers
+      class MutationFieldSetter
+        def initialize(authenticatable_type)
+          @authenticatable_type = authenticatable_type
+        end
+
+        def call(mutation)
+          mutation.field(:authenticatable, @authenticatable_type, null: false)
+
+          mutation
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparers/resolver_type_setter.rb

@@ -0,0 +1,17 @@
+module GraphqlDevise
+  module MountMethod
+    module OperationPreparers
+      class ResolverTypeSetter
+        def initialize(authenticatable_type)
+          @authenticatable_type = authenticatable_type
+        end
+
+        def call(resolver)
+          resolver.type(@authenticatable_type, null: false)
+
+          resolver
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_preparers/resource_name_setter.rb

@@ -0,0 +1,17 @@
+module GraphqlDevise
+  module MountMethod
+    module OperationPreparers
+      class ResourceNameSetter
+        def initialize(name)
+          @name = name
+        end
+
+        def call(operation)
+          operation.instance_variable_set(:@resource_name, @name.to_sym)
+
+          operation
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/operation_sanitizer.rb

@@ -0,0 +1,29 @@
+module GraphqlDevise
+  module MountMethod
+    class OperationSanitizer
+      def self.call(default:, only:, skipped:)
+        new(
+          default: default,
+          only:    only,
+          skipped: skipped
+        ).call
+      end
+
+      def initialize(default:, only:, skipped:)
+        @default = default
+        @only    = only
+        @skipped = skipped
+      end
+
+      def call
+        if @only.present?
+          @default.slice(*@only)
+        elsif @skipped.present?
+          @default.except(*@skipped)
+        else
+          @default
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/option_sanitizer.rb

@@ -0,0 +1,18 @@
+require_relative 'supported_options'
+
+module GraphqlDevise
+  module MountMethod
+    class OptionSanitizer
+      def initialize(options = {}, supported_options = MountMethod::SUPPORTED_OPTIONS)
+        @options           = options
+        @supported_options = supported_options
+      end
+
+      def call!
+        @supported_options.each_with_object(Struct.new(*@supported_options.keys).new) do |(key, checker), result|
+          result[key] = checker.call!(@options[key], key)
+        end
+      end
+    end
+  end
+end

data/lib/graphql_devise/mount_method/option_sanitizers/array_checker.rb

@@ -0,0 +1,26 @@
+module GraphqlDevise
+  module MountMethod
+    module OptionSanitizers
+      class ArrayChecker
+        def initialize(element_type)
+          @element_type  = element_type
+          @default_value = []
+        end
+
+        def call!(value, key)
+          return @default_value if value.blank?
+
+          unless value.instance_of?(Array)
+            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has an invalid value. Array expected."
+          end
+
+          unless value.all? { |element| element.instance_of?(@element_type) }
+            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has invalid elements. #{@element_type} expected."
+          end
+
+          value
+        end
+      end
+    end
+  end
+end