search_object_graphql 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20d420d2ee1dd08bdfe48da2c5e1e3ba0a3a8233
-  data.tar.gz: 57a5009d415d6fad948001d18d428676dbd1471c
+SHA256:
+  metadata.gz: 3f77197a83b86e6ec05a3cb7f0f814bcd8e2d9d5590319b995657eccc64700f3
+  data.tar.gz: f31f8c4374c23da84bcccc42b6fc8307e08661cab1c67bed324aea90c2780faf
 SHA512:
-  metadata.gz: d25a679fad52b5605c5720a774f2bee6d273abc369dbfd90cc48a75793d7fd3cc6359092406d178aecd0ae97fdb6e2f938f891b764b2ebfb26c47bf99fc63605
-  data.tar.gz: f7d5f5e368c50e3bc274b8d665c83ca975f1093e55a7059c906f17e93a40388c097d51ce7288b99394b3d8268913bfe0ea1ef1d2a611bedaa0e7df9380160f5f
+  metadata.gz: 223b83055eaa7e7630694aee66c69abaa01d28a00f091535613b26c7d2f037370f6953ebcaba9d534315fcc381d0aecfbda06b0e0b25b9a0e015b01a233f29c8
+  data.tar.gz: 24a16c64a585f012bf10a10d0deefe724fec63338b7d901571595ccd92c7f8643373391f63165c2c30bb52d23a7d0e258f936dc7039ff06840140d303f9c5549

data/.rubocop.yml

@@ -26,10 +26,22 @@ Style/EachWithObject:
 Style/CollectionMethods:
   Enabled: false
 
+# Disables "Avoid the use of double negation (!!)."
+Style/DoubleNegation:
+  Enabled: false
+
 # Disables "Block has too many lines."
 Metrics/BlockLength:
   Enabled: false
 
+# Disables "Assignment Branch Condition size for field_options is too high."
+Metrics/AbcSize:
+  Enabled: false
+
+# Disables "Method has too many line."
+Metrics/MethodLength:
+  Enabled: false
+
 # Disables "Example has too many lines."
 RSpec/ExampleLength:
   Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3.0
+  - 2.4.1
+  - 2.5.2
+  - 2.6.0
 script:
   - bundle exec rubocop
   - bundle exec rspec spec

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 0.2
+
+* Added support for GraphQL::Schema::Resolver (@rstankov)
+* Added support for GraphQL 1.8 class API (@rstankov)
+
 ## Version 0.1
 
 * Initial release (@rstankov)

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in search_object.gemspec

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/search_object_graphql.svg)](http://badge.fury.io/rb/search_object_graphql)
 [![Code Climate](https://codeclimate.com/github/RStankov/SearchObjectGraphQL.svg)](https://codeclimate.com/github/RStankov/SearchObjectGraphQL)
 [![Build Status](https://secure.travis-ci.org/RStankov/SearchObjectGraphQL.svg)](http://travis-ci.org/RStankov/SearchObjectGraphQL)
 [![Code coverage](https://coveralls.io/repos/RStankov/SearchObjectGraphQL/badge.svg?branch=master#2)](https://coveralls.io/r/RStankov/SearchObjectGraphQL)
@@ -19,13 +20,15 @@
   * [Accessing Parent Object](#accessing-parent-object)
   * [Enums Support](#enums-support)
   * [Relay Support](#relay-support)
+* [Contributing](#contributing)
+* [License](#license)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'search_object'
+gem 'search_object_graphql'
 ```
 
 And then execute:
@@ -34,7 +37,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install search_object
+    $ gem install search_object_graphql
 
 ## Dependencies
 
@@ -49,19 +52,19 @@ Just include the ```SearchObject.module``` and define your search options and th
 class PostResolver
   include SearchObject.module(:graphql)
 
-  type PostType
+  type [PostType], null: false
 
   scope { Post.all }
 
-  option(:name, type: types.String)       { |scope, value| scope.where name: value }
-  option(:published, type: types.Boolean) { |scope, value| value ? scope.published : scope.unpublished }
+  option(:name, type: String)       { |scope, value| scope.where name: value }
+  option(:published, type: Boolean) { |scope, value| value ? scope.published : scope.unpublished }
 end
 ```
 
-Then you can just use `PostResolver` as [GraphQL::Function](https://rmosolgo.github.io/graphql-ruby/schema/code_reuse#functions):
+Then you can just use `PostResolver` as [GraphQL::Schema::Resolver](https://graphql-ruby.org/fields/resolvers.html):
 
 ```ruby
-field :posts, function: PostResolver
+field :posts, resolver: PostResolver
 ```
 
 Options are exposed as arguments in the GraphQL query:
@@ -78,26 +81,6 @@ You can find example of most important features and plugins - [here](https://git
 
 ## Features
 
-### Custom Types
-
-Custom types can be define inside the search object:
-
-```ruby
-class PostResolver
-  include SearchObject.module(:graphql)
-
-  type do
-    name 'Custom Type'
-
-    field :id, !types.ID
-    field :title, !types.String
-    field :body, !types.String
-  end
-
-  # ...
-end
-```
-
 ### Documentation
 
 Search object itself can be documented, as well as its options:
@@ -174,10 +157,36 @@ end
 
 ### Relay Support
 
-Search objects can be used as [Relay Connections](https://rmosolgo.github.io/graphql-ruby/relay/connections):
+Search objects can be used as [Relay Connections](https://graphql-ruby.org/relay/connections.html):
 
 ```ruby
-connection :posts, Types::PostType.connection_type, function: Resolvers::PostSearch
+class PostResolver
+  include SearchObject.module(:graphql)
+
+  type PostType.connection_type, null: false
+
+  # ...
+end
+```
+
+```ruby
+field :posts, resolver: PostResolver
+```
+
+### Legacy Function Support
+
+```ruby
+class PostResolver
+  include SearchObject.module(:graphql)
+
+  type [PostType], null: false
+
+  # ...
+end
+```
+
+```ruby
+field :posts, function: PostResolver
 ```
 
 ## Contributing

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -5,4 +7,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/example/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.1

data/example/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) do |repo_name|
@@ -5,7 +7,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', '~> 5.1.0'
+gem 'rails', '~> 5.2.0'
 
 gem 'graphql'
 gem 'puma', '~> 3.7'

data/example/README.md

@@ -16,9 +16,9 @@ This is example application showing, one of the possible usages of ```SearchObje
 ```
 gem install bundler
 bundle install
-rake db:create
-rake db:migrate
-rake db:seed
+rails db:create
+rails db:migrate
+rails db:seed
 
 rails server
 ```

data/example/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/example/app/controllers/application_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::API
 end

data/example/app/controllers/graphql_controller.rb

@@ -1,29 +1,33 @@
+# frozen_string_literal: true
+
 class GraphqlController < ApplicationController
   def execute
-    render json: Schema.execute(query, variables: variables, context: context)
+    result = Schema.execute(params[:query],
+                            variables: ensure_hash(params[:variables]),
+                            context: {},
+                            operation_name: params[:operationName])
+    render json: result
+  rescue StandardError => error
+    raise error unless Rails.env.development?
+
+    handle_error_in_development error
   end
 
   private
 
-  def query
-    params[:query]
-  end
-
-  def variables
-    ensure_hash(params[:variables])
+  def ensure_hash(ambiguous_param)
+    case ambiguous_param
+    when String then ambiguous_param.present? ? ensure_hash(JSON.parse(ambiguous_param)) : {}
+    when Hash, ActionController::Parameters then ambiguous_param
+    when nil then {}
+    else raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
+    end
   end
 
-  def context
-    {}
-  end
+  def handle_error_in_development(error)
+    logger.error error.message
+    logger.error error.backtrace.join("\n")
 
-  # Handle form data, JSON body, or a blank value
-  def ensure_hash(params)
-    case params
-    when String then params.present? ? ensure_hash(JSON.parse(params)) : {}
-    when Hash, ActionController::Parameters then params
-    when nil then {}
-    else raise ArgumentError, "Unexpected parameter: #{params}"
-    end
+    render json: { error: { message: error.message, backtrace: error.backtrace }, data: {} }, status: 500
   end
 end

data/example/app/graphql/resolvers/base_search_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Resolvers
   class BaseSearchResolver
     include SearchObject.module(:graphql)

data/example/app/graphql/resolvers/category_search.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Resolvers
   class CategorySearch < Resolvers::BaseSearchResolver
-    type Types::CategoryType
+    type Types::CategoryType.connection_type
     description 'Lists categories'
 
-    OrderEnum = GraphQL::EnumType.define do
-      name 'CategoryOrder'
+    class OrderEnum < Types::BaseEnum
+      graphql_name 'CategoryOrder'
 
       value 'RECENT'
       value 'NAME'

data/example/app/graphql/resolvers/post_search.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Resolvers
   class PostSearch < Resolvers::BaseSearchResolver
-    type Types::PostType
+    type Types::PostType.connection_type
     description 'Lists posts'
 
-    OrderEnum = GraphQL::EnumType.define do
-      name 'PostOrder'
+    class OrderEnum < Types::BaseEnum
+      graphql_name 'PostOrder'
 
       value 'RECENT'
       value 'VIEWS'
@@ -51,7 +53,7 @@ module Resolvers
     end
 
     def apply_order_with_recent(scope)
-      scope.order 'published_at IS NOT NULL, published_at DESC'
+      scope.order Arel.sql('published_at IS NOT NULL'), published_at: :desc
     end
 
     def apply_order_with_views(scope)

data/example/app/graphql/schema.rb

@@ -1,3 +1,5 @@
-Schema = GraphQL::Schema.define do
+# frozen_string_literal: true
+
+class Schema < GraphQL::Schema
   query Types::QueryType
 end

data/example/app/graphql/types/base_enum.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Types
+  class BaseEnum < GraphQL::Schema::Enum
+  end
+end

data/example/app/graphql/types/base_input_object.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Types
+  class BaseInputObject < GraphQL::Schema::InputObject
+  end
+end

data/example/app/graphql/types/base_interface.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Types
+  module BaseInterface
+    include GraphQL::Schema::Interface
+  end
+end

data/example/app/graphql/types/base_object.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Types
+  class BaseObject < GraphQL::Schema::Object
+  end
+end

data/example/app/graphql/types/base_scalar.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Types
+  class BaseScalar < GraphQL::Schema::Scalar
+  end
+end

data/example/app/graphql/types/base_union.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Types
+  class BaseUnion < GraphQL::Schema::Union
+  end
+end

data/example/app/graphql/types/category_type.rb

@@ -1,8 +1,9 @@
-Types::CategoryType = GraphQL::ObjectType.define do
-  name 'Category'
+# frozen_string_literal: true
 
-  field :id, !types.ID
-  field :name, !types.String
-
-  connection :posts, Types::PostType.connection_type, function: Resolvers::PostSearch
+module Types
+  class CategoryType < BaseObject
+    field :id, ID, null: false
+    field :name, String, null: false
+    field :posts, function: Resolvers::PostSearch
+  end
 end

data/example/app/graphql/types/date_time_type.rb

@@ -1,6 +1,5 @@
-Types::DateTimeType = GraphQL::ScalarType.define do
-  name 'DateTime'
+# frozen_string_literal: true
 
-  coerce_input ->(value, _ctx) { Time.zone.parse(value) }
-  coerce_result ->(value, _ctx) { value.utc.iso8601 }
+module Types
+  DateTimeType = GraphQL::Types::ISO8601DateTime
 end

data/example/app/graphql/types/mutation_type.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Types
+  class MutationType < Types::BaseObject
+  end
+end

data/example/app/graphql/types/post_type.rb

@@ -1,13 +1,15 @@
-Types::PostType = GraphQL::ObjectType.define do
-  name 'Post'
+# frozen_string_literal: true
 
-  field :id, !types.ID
-  field :title, !types.String
-  field :body, !types.String
-  field :category, !Types::CategoryType
-  field :viewsCount, !types.Int, property: :views_count
-  field :likesCount, !types.Int, property: :likes_count
-  field :commentsCount, !types.Int, property: :comments_count
-  field :isPublished, !types.Boolean, property: :published?
-  field :publishedAt, !Types::DateTimeType, property: :published_at
+module Types
+  class PostType < BaseObject
+    field :id, ID, null: false
+    field :title, String, null: false
+    field :body, String, null: false
+    field :category, CategoryType, null: false
+    field :views_count, Int, null: false
+    field :likes_count, Int, null: false
+    field :comments_count, Int, null: false
+    field :is_published, Boolean, null: false, method: :published?
+    field :published_at, DateTimeType, null: false
+  end
 end

data/example/app/graphql/types/query_type.rb

@@ -1,7 +1,8 @@
-Types::QueryType = GraphQL::ObjectType.define do
-  name 'Query'
+# frozen_string_literal: true
 
-  connection :categories, Types::CategoryType.connection_type, function: Resolvers::CategorySearch
-
-  connection :posts, Types::PostType.connection_type, function: Resolvers::PostSearch
+module Types
+  class QueryType < Types::BaseObject
+    field :categories, function: Resolvers::CategorySearch
+    field :posts, resolver: Resolvers::PostSearch
+  end
 end

data/example/app/models/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

data/example/app/models/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Category < ApplicationRecord
   validates :name, presence: true, uniqueness: true
 

data/example/app/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Post < ApplicationRecord
   validates :title, presence: true, uniqueness: true
   validates :body, presence: true

data/example/bin/bundle

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/example/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/example/bin/rake

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/example/bin/setup

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'pathname'
 require 'fileutils'
-include FileUtils
+include FileUtils # rubocop:disable Style/MixinUsage
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")

data/example/bin/update

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'pathname'
 require 'fileutils'
-include FileUtils
+include FileUtils # rubocop:disable Style/MixinUsage
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")

data/example/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require_relative 'config/environment'

data/example/config/application.rb

@@ -3,7 +3,7 @@ require_relative 'boot'
 require "rails"
 # Pick the frameworks you want:
 require "active_model/railtie"
-# require "active_job/railtie"
+require "active_job/railtie"
 require "active_record/railtie"
 require "action_controller/railtie"
 # require "action_mailer/railtie"

data/example/db/migrate/20170507175133_create_demo_tables.rb

@@ -7,7 +7,7 @@ class CreateDemoTables < ActiveRecord::Migration[5.1]
     end
 
     create_table :posts do |t|
-      t.references :category, foreign_key: true
+      t.references :category
       t.string :title, null: false
       t.index :title, unique: true
       t.string :body, null: false

data/example/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170507175133) do
+ActiveRecord::Schema.define(version: 2017_05_07_175133) do
 
   create_table "categories", force: :cascade do |t|
     t.string "name", null: false

data/lib/search_object/plugin/graphql.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module SearchObject
   module Plugin
     module Graphql
       def self.included(base)
         base.include SearchObject::Plugin::Enum
+        base.include ::GraphQL::Schema::Member::GraphQLTypeNames
         base.extend ClassMethods
       end
 
@@ -15,49 +18,117 @@ module SearchObject
         super filters: filters, scope: scope
       end
 
+      # NOTE(rstankov): GraphQL::Schema::Resolver interface
+      # Documentation - http://graphql-ruby.org/fields/resolvers.html#using-resolver
+      def resolve_with_support(args = {})
+        self.params = args.to_h
+        results
+      end
+
       module ClassMethods
+        KEYS = %i[type default description].freeze
         def option(name, options = {}, &block)
-          argument = Helper.build_argument(name, options)
-          arguments[argument.name] = argument
+          config[:arguments] ||= {}
+          config[:arguments][name.to_s] = KEYS.inject({}) do |acc, key|
+            acc[key] = options[key] if options.key?(key)
+            acc
+          end
 
-          options[:enum] = argument.type.values.keys if argument.type.is_a? GraphQL::EnumType
+          type = options.fetch(:type) { raise MissingTypeDefinitionError, name }
+          options[:enum] = type.values.keys if type.respond_to?(:values)
 
           super(name, options, &block)
         end
 
-        def types
-          GraphQL::Define::TypeDefiner.instance
-        end
-
-        # NOTE(rstankov): GraphQL::Function interface
-        # Documentation - https://rmosolgo.github.io/graphql-ruby/schema/code_reuse#functions
-        def call(object, args, context)
-          new(filters: args.to_h, object: object, context: context).results
-        end
-
-        def arguments
-          config[:args] ||= {}
-        end
-
-        def type(value = :default, &block)
+        def type(value = :default, null: true, &block)
           return config[:type] if value == :default && !block_given?
+
           config[:type] = block_given? ? GraphQL::ObjectType.define(&block) : value
+          config[:null] = null
         end
 
         def complexity(value = :default)
           return config[:complexity] || 1 if value == :default
+
           config[:complexity] = value
         end
 
         def description(value = :default)
           return config[:description] if value == :default
+
           config[:description] = value
         end
 
         def deprecation_reason(value = :default)
           return config[:deprecation_reason] if value == :default
+
           config[:deprecation_reason] = value
         end
+
+        # NOTE(rstankov): GraphQL::Function interface (deprecated in favour of GraphQL::Schema::Resolver)
+        # Documentation - http://graphql-ruby.org/guides
+        def call(object, args, context)
+          new(filters: args.to_h, object: object, context: context).results
+        end
+
+        # NOTE(rstankov): Used for GraphQL::Function
+        def types
+          GraphQL::Define::TypeDefiner.instance
+        end
+
+        # NOTE(rstankov): Used for GraphQL::Function
+        def arguments
+          (config[:arguments] || {}).inject({}) do |acc, (name, options)|
+            argument = GraphQL::Argument.new
+            argument.name = name.to_s
+            argument.type = options.fetch(:type) { raise MissingTypeDefinitionError, name }
+            argument.default_value = options[:default] if options.key? :default
+            argument.description = options[:description] if options.key? :description
+
+            acc[name] = argument
+            acc
+          end
+        end
+
+        # NOTE(rstankov): Used for GraphQL::Schema::Resolver
+        def field_options
+          {
+            type: type,
+            description: description,
+            extras: [],
+            resolver_method: :resolve_with_support,
+            resolver_class: self,
+            deprecation_reason: deprecation_reason,
+            arguments: (config[:arguments] || {}).inject({}) do |acc, (name, options)|
+              acc[name] = ::GraphQL::Schema::Argument.new(
+                name: name.to_s,
+                type: options.fetch(:type) { raise MissingTypeDefinitionError, name },
+                description: options[:description],
+                required: !!options[:required],
+                default_value: options.fetch(:default) { ::GraphQL::Schema::Argument::NO_DEFAULT },
+                owner: self
+              )
+              acc
+            end,
+            null: !!config[:null],
+            complexity: complexity
+          }
+        end
+
+        # NOTE(rstankov): Used for GraphQL::Schema::Resolver
+        def visible?(_context)
+          true
+        end
+
+        # NOTE(rstankov): Used for GraphQL::Schema::Resolver
+        def accessible?(_context)
+          true
+        end
+
+        # NOTE(rstankov): Used for GraphQL::Schema::Resolver
+        def authorized?(_object, _context)
+          true
+        end
       end
 
       class MissingTypeDefinitionError < ArgumentError
@@ -65,20 +136,6 @@ module SearchObject
           super "GraphQL type has to passed as :type to '#{name}' option"
         end
       end
-
-      # :api: private
-      module Helper
-        module_function
-
-        def build_argument(name, options)
-          argument = GraphQL::Argument.new
-          argument.name = name.to_s
-          argument.type = options.fetch(:type) { raise MissingTypeDefinitionError, name }
-          argument.default_value = options[:default] if options.key? :default
-          argument.description = options[:description] if options.key? :description
-          argument
-        end
-      end
     end
   end
 end

data/lib/search_object/plugin/graphql/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module SearchObject
   module Plugin
     module Graphql
-      VERSION = '0.1'.freeze
+      VERSION = '0.2'
     end
   end
 end

data/search_object_graphql.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'English'
 require 'search_object/plugin/graphql/version'
@@ -19,13 +20,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'search_object', '~> 1.2'
-  spec.add_dependency 'graphql', '~> 1.5'
+  spec.add_dependency 'graphql', '~> 1.8'
+  spec.add_dependency 'search_object', '~> 1.2.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'rubocop', '0.46.0'
-  spec.add_development_dependency 'rubocop-rspec', '1.8.0'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.8'
+  spec.add_development_dependency 'rubocop', '0.62.0'
+  spec.add_development_dependency 'rubocop-rspec', '1.31.0'
 end

data/spec/search_object/plugin/graphql_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'graphql'
 require 'ostruct'
@@ -10,20 +12,18 @@ describe SearchObject::Plugin::Graphql do
     end
   end
 
-  PostType = GraphQL::ObjectType.define do
-    name 'Post'
-
-    field :id, !types.ID
+  class PostType < GraphQL::Schema::Object
+    field :id, ID, null: false
   end
 
   def define_schema(&block)
-    query_type = GraphQL::ObjectType.define do
-      name 'Query'
+    query_type = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'Query'
 
       instance_eval(&block)
     end
 
-    GraphQL::Schema.define do
+    Class.new(GraphQL::Schema) do
       query query_type
 
       max_complexity 1000
@@ -45,20 +45,60 @@ describe SearchObject::Plugin::Graphql do
 
     define_schema do
       if search_object.type.nil?
-        field :posts, types[PostType], function: search_object
+        field :posts, [PostType], resolver: search_object
       else
-        field :posts, function: search_object
+        field :posts, resolver: search_object
       end
     end
   end
 
+  it 'can be used as GraphQL::Schema::Resolver' do
+    post_type = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'Post'
+
+      field :id, GraphQL::Types::ID, null: false
+    end
+
+    search_object = define_search_class do
+      scope { [Post.new('1'), Post.new('2'), Post.new('3')] }
+
+      type [post_type]
+
+      option(:id, type: !types.ID) { |scope, value| scope.select { |p| p.id == value } }
+    end
+
+    schema = define_schema do
+      field :posts, resolver: search_object
+    end
+
+    result = schema.execute '{ posts(id: "2") { id } }'
+
+    expect(result).to eq(
+      'data' => {
+        'posts' => [Post.new('2').to_json]
+      }
+    )
+  end
+
   it 'can be used as GraphQL::Function' do
-    schema = define_search_class_and_return_schema do
+    post_type = GraphQL::ObjectType.define do
+      name 'Post'
+
+      field :id, !types.ID
+    end
+
+    search_object = define_search_class do
       scope { [Post.new('1'), Post.new('2'), Post.new('3')] }
 
+      type types[post_type]
+
       option(:id, type: !types.ID) { |scope, value| scope.select { |p| p.id == value } }
     end
 
+    schema = define_schema do
+      field :posts, function: search_object
+    end
+
     result = schema.execute '{ posts(id: "2") { id } }'
 
     expect(result).to eq(
@@ -73,19 +113,19 @@ describe SearchObject::Plugin::Graphql do
       scope { object.posts }
     end
 
-    parent_type = GraphQL::ObjectType.define do
-      name 'ParentType'
+    parent_type = Class.new(GraphQL::Schema::Object) do
+      graphql_name 'Parent'
 
-      field :posts, types[PostType], function: search_object
+      field :posts, [PostType], resolver: search_object
     end
 
     schema = define_schema do
-      field :parent, parent_type do
-        resolve ->(_obj, _args, _ctx) { OpenStruct.new posts: [Post.new('from_parent')] }
-      end
+      field :parent, parent_type, null: false
     end
 
-    result = schema.execute '{ parent { posts { id }  } }'
+    root = OpenStruct.new(parent: OpenStruct.new(posts: [Post.new('from_parent')]))
+
+    result = schema.execute '{ parent { posts { id }  } }', root_value: root
 
     expect(result).to eq(
       'data' => {
@@ -174,7 +214,7 @@ describe SearchObject::Plugin::Graphql do
 
   it 'can be marked as deprecated' do
     schema = define_search_class_and_return_schema do
-      type types[PostType]
+      type [PostType]
       deprecation_reason 'Not needed any more'
     end
 
@@ -189,7 +229,7 @@ describe SearchObject::Plugin::Graphql do
       }
     QUERY
 
-    expect(result).to eq(
+    expect(result.to_h).to eq(
       'data' => {
         '__type' => {
           'name' => 'Query',
@@ -200,6 +240,35 @@ describe SearchObject::Plugin::Graphql do
   end
 
   describe 'option' do
+    it 'converts GraphQL::Schema::Enum to SearchObject enum' do
+      schema = define_search_class_and_return_schema do
+        enum_type = Class.new(GraphQL::Schema::Enum) do
+          graphql_name 'PostOrder'
+
+          value 'PRICE'
+          value 'DATE'
+        end
+
+        option(:order, type: enum_type)
+
+        define_method(:apply_order_with_price) do |_scope|
+          [Post.new('price')]
+        end
+
+        define_method(:apply_order_with_date) do |_scope|
+          [Post.new('date')]
+        end
+      end
+
+      result = schema.execute '{ posts(order: PRICE) { id } }'
+
+      expect(result).to eq(
+        'data' => {
+          'posts' => [Post.new('price').to_json]
+        }
+      )
+    end
+
     it 'converts GraphQL::EnumType to SearchObject enum' do
       schema = define_search_class_and_return_schema do
         enum_type = GraphQL::EnumType.define do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 
 if ENV['TRAVIS']

data/spec/spec_helper_active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 require 'active_record'
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: search_object_graphql
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Radoslav Stankov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: search_object
+  name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: graphql
+  name: search_object
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,56 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.31.0
 description: Search Object plugin to working with GraphQL
 email:
 - rstankov@gmail.com
@@ -133,6 +119,7 @@ files:
 - ".projections.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -146,13 +133,21 @@ files:
 - example/Rakefile
 - example/app/controllers/application_controller.rb
 - example/app/controllers/graphql_controller.rb
+- example/app/graphql/mutations/.keep
 - example/app/graphql/resolvers/base_search_resolver.rb
 - example/app/graphql/resolvers/category_search.rb
 - example/app/graphql/resolvers/post_search.rb
 - example/app/graphql/schema.rb
 - example/app/graphql/types/.keep
+- example/app/graphql/types/base_enum.rb
+- example/app/graphql/types/base_input_object.rb
+- example/app/graphql/types/base_interface.rb
+- example/app/graphql/types/base_object.rb
+- example/app/graphql/types/base_scalar.rb
+- example/app/graphql/types/base_union.rb
 - example/app/graphql/types/category_type.rb
 - example/app/graphql/types/date_time_type.rb
+- example/app/graphql/types/mutation_type.rb
 - example/app/graphql/types/post_type.rb
 - example/app/graphql/types/query_type.rb
 - example/app/models/application_record.rb
@@ -181,6 +176,7 @@ files:
 - example/db/schema.rb
 - example/db/seeds.rb
 - example/log/.keep
+- example/public/favicon.ico
 - example/public/robots.txt
 - example/vendor/.keep
 - lib/search_object/plugin/graphql.rb
@@ -209,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Maps search objects to GraphQL resolvers