graphql_rails 1.0.0 → 1.1.0

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    # stores information about model specific config, like attributes and types
+    class FindOrBuildGraphqlType
+      require 'graphql_rails/concerns/service'
+      require 'graphql_rails/model/find_or_build_graphql_type_class'
+      require 'graphql_rails/model/add_fields_to_graphql_type'
+
+      include ::GraphqlRails::Service
+
+      def initialize(name:, description:, attributes:, type_name:)
+        @name = name
+        @description = description
+        @attributes = attributes
+        @type_name = type_name
+      end
+
+      def call
+        klass.tap { add_fields_to_graphql_type if new_class? }
+      end
+
+      private
+
+      attr_reader :name, :description, :attributes, :type_name
+
+      delegate :klass, :new_class?, to: :type_class_finder
+
+      def type_class_finder
+        @type_class_finder ||= FindOrBuildGraphqlTypeClass.new(
+          name: name,
+          type_name: type_name,
+          description: description
+        )
+      end
+
+      def add_fields_to_graphql_type
+        AddFieldsToGraphqlType.call(klass: klass, attributes: attributes.values.select(&:scalar_type?))
+
+        attributes.values.reject(&:scalar_type?).tap do |dynamic_attributes|
+          find_or_build_dynamic_graphql_types(dynamic_attributes) do |name, description, attributes, type_name|
+            self.class.call(
+              name: name, description: description,
+              attributes: attributes, type_name: type_name
+            )
+          end
+          AddFieldsToGraphqlType.call(klass: klass, attributes: dynamic_attributes)
+        end
+      end
+
+      def find_or_build_dynamic_graphql_types(dynamic_attributes)
+        dynamic_attributes.each do |attribute|
+          yield(
+            attribute.graphql_model.graphql.name,
+            attribute.graphql_model.graphql.description,
+            attribute.graphql_model.graphql.attributes,
+            attribute.graphql_model.graphql.type_name
+          )
+        end
+      end
+    end
+  end
+end

data/lib/graphql_rails/model/find_or_build_graphql_type_class.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module GraphqlRails
+  module Model
+    # Initializes class to define graphql type and fields.
+    class FindOrBuildGraphqlTypeClass
+      require 'graphql_rails/concerns/service'
+
+      include ::GraphqlRails::Service
+
+      def initialize(name:, type_name:, description: nil)
+        @name = name
+        @type_name = type_name
+        @description = description
+        @new_class = false
+      end
+
+      def klass
+        @klass ||= Object.const_defined?(type_name) && Object.const_get(type_name) || build_graphql_type_klass
+      end
+
+      def new_class?
+        new_class
+      end
+
+      private
+
+      attr_accessor :new_class
+      attr_reader :name, :type_name, :description
+
+      def build_graphql_type_klass
+        graphql_type_name = name
+        graphql_type_description = description
+
+        graphql_type_klass = Class.new(GraphQL::Schema::Object) do
+          graphql_name(graphql_type_name)
+          description(graphql_type_description)
+        end
+
+        self.new_class = true
+
+        Object.const_set(type_name, graphql_type_klass)
+      end
+    end
+  end
+end

data/lib/graphql_rails/router.rb

@@ -85,7 +85,7 @@ module GraphqlRails
       default_options = { module_name: module_name, group_names: group_names }
       full_options = default_options.merge(new_router_options)
 
-      self.class.new(full_options)
+      self.class.new(**full_options)
     end
 
     def add_raw_action(name, *args, &block)
@@ -93,7 +93,7 @@ module GraphqlRails
     end
 
     def build_route(route_builder, name, **options)
-      route_builder.new(name, full_route_options(options))
+      route_builder.new(name, **full_route_options(options))
     end
 
     def full_route_options(extra_options)

data/lib/graphql_rails/router/resource_routes_builder.rb

@@ -20,12 +20,12 @@ module GraphqlRails
         @routes ||= initial_routes
       end
 
-      def query(*args)
-        routes << build_query(*args)
+      def query(*args, **kwargs)
+        routes << build_query(*args, **kwargs)
       end
 
-      def mutation(*args)
-        routes << build_mutation(*args)
+      def mutation(*args, **kwargs)
+        routes << build_mutation(*args, **kwargs)
       end
 
       private
@@ -54,12 +54,12 @@ module GraphqlRails
         routes
       end
 
-      def build_mutation(*args)
-        build_route(MutationRoute, *args)
+      def build_mutation(*args, **kwargs)
+        build_route(MutationRoute, *args, **kwargs)
       end
 
-      def build_query(*args)
-        build_route(QueryRoute, *args)
+      def build_query(*args, **kwargs)
+        build_route(QueryRoute, *args, **kwargs)
       end
 
       # rubocop:disable Metrics/ParameterLists

data/lib/graphql_rails/router/route.rb

@@ -33,16 +33,12 @@ module GraphqlRails
         groups.include?(group_name&.to_sym)
       end
 
-      def field_args
-        options = {}
-
+      def field_options
         if function
-          options[:function] = function
+          { function: function }
         else
-          options[:resolver] = resolver
+          { resolver: resolver }
         end
-
-        [name, options]
       end
 
       private

data/lib/graphql_rails/router/schema_builder.rb

@@ -46,7 +46,7 @@ module GraphqlRails
           graphql_name(type_name)
 
           group_routes.each do |route|
-            field(*route.field_args)
+            field(*route.name, **route.field_options)
           end
 
           def self.inspect

data/lib/graphql_rails/rspec_controller_helpers.rb

@@ -109,8 +109,8 @@ module GraphqlRails
       @response
     end
 
-    def mutation(*args)
-      query(*args)
+    def mutation(*args, **kwargs)
+      query(*args, **kwargs)
     end
 
     def response

data/lib/graphql_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlRails
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Povilas Jurčys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.12
+        version: 1.11.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.12
+        version: 1.11.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 description: 
 email:
 - po.jurcys@gmail.com
@@ -198,14 +204,16 @@ files:
 - lib/graphql_rails/integrations/lograge.rb
 - lib/graphql_rails/integrations/sentry.rb
 - lib/graphql_rails/model.rb
+- lib/graphql_rails/model/add_fields_to_graphql_type.rb
 - lib/graphql_rails/model/build_connection_type.rb
 - lib/graphql_rails/model/build_connection_type/count_items.rb
 - lib/graphql_rails/model/build_enum_type.rb
 - lib/graphql_rails/model/build_graphql_input_type.rb
-- lib/graphql_rails/model/build_graphql_type.rb
 - lib/graphql_rails/model/call_graphql_model_method.rb
 - lib/graphql_rails/model/configurable.rb
 - lib/graphql_rails/model/configuration.rb
+- lib/graphql_rails/model/find_or_build_graphql_type.rb
+- lib/graphql_rails/model/find_or_build_graphql_type_class.rb
 - lib/graphql_rails/model/input.rb
 - lib/graphql_rails/query_runner.rb
 - lib/graphql_rails/railtie.rb
@@ -239,9 +247,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: GraphQL server and client for rails
+summary: Rails style structure for GraphQL API.
 test_files: []

data/lib/graphql_rails/model/build_graphql_type.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module GraphqlRails
-  module Model
-    # stores information about model specific config, like attributes and types
-    class BuildGraphqlType
-      require 'graphql_rails/concerns/service'
-      require 'graphql_rails/model/call_graphql_model_method'
-
-      include ::GraphqlRails::Service
-
-      PAGINATION_KEYS = %i[before after first last].freeze
-
-      def initialize(name:, description: nil, attributes:)
-        @name = name
-        @attributes = attributes
-        @description = description
-      end
-
-      def call
-        type_name = name
-        type_description = description
-        type_attributes = attributes
-
-        Class.new(GraphQL::Schema::Object) do
-          graphql_name(type_name)
-          description(type_description)
-
-          type_attributes.each_value do |attribute|
-            field(*attribute.field_args) do
-              attribute.attributes.values.each do |arg_attribute|
-                argument(*arg_attribute.input_argument_args)
-              end
-            end
-
-            define_method attribute.property do |**kwargs|
-              CallGraphqlModelMethod.call(
-                model: object,
-                attribute_config: attribute,
-                method_keyword_arguments: kwargs,
-                graphql_context: context
-              )
-            end
-          end
-        end
-      end
-
-      private
-
-      attr_reader :attributes, :name, :description
-    end
-  end
-end