graphql_rails 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c6e2cd4ba018ee3af6aa4461b67b29ed202d21a93b5d0ea877d5fdfdecfbc7
-  data.tar.gz: 5955a5e193a761dd3821107bb60c02db6aa8d72717b0288b4863b79920a8ad4e
+  metadata.gz: 4f7c503110a2423bb3e0b90154f9d0c4f6daeabc3315a1c49c1a832a29366ff2
+  data.tar.gz: bfc7779f2678094724d0d1c3368edaa792665493a32d5112c5864998879fe96c
 SHA512:
-  metadata.gz: 9342f037b0b41b4a70621787f14188da08693fa773d0efd2e3148c8d6be7e6086e3ae8215d349e72ab3a7448643f49ca7ccc2fe9c3d5a911d152a9a06131d164
-  data.tar.gz: c3ef9dda6a219e42394e3027fe4710af88360c8f699a13d8bc66a11c1bf8c31a25a295e6a217d8c1b04e6826899e24d73950a279d5f5505893601181e6da8d28
+  metadata.gz: 740f486bb00615a7b83a78a8d5dc6d72d7d57dc0a42385178d1cc87875e264f0370f3131ca1e327f8d510f2126b7956915ead75374b06c81e99c96f98b6d57b9
+  data.tar.gz: df08d0a84e9f505d25922d460677ddf2d34e5333258d111e9ee95090747612ccbb789d4f44d88f9cb1779a2afd4bbe4765b1ecabb1e88e2d75b777a05f94f3a4

data/.github/workflows/ruby.yml

@@ -0,0 +1,18 @@
+name: Ruby
+on: [push, pull_request]
+jobs:
+  specs:
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    runs-on: ubuntu-latest
+    env:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

data/.hound.yml

@@ -1,4 +1,4 @@
 rubocop:
   config_file: .rubocop.yml
-  version: 0.91.0
+  version: 1.5.2
 fail_on_violations: true

data/.rubocop.yml

@@ -35,6 +35,7 @@ Style/ClassAndModuleChildren:
     - spec/**/*_spec.rb
 
 AllCops:
+  NewCops: disable # TODO: enable
   TargetRubyVersion: 2.7
   Exclude:
     - bin/*

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.1

data/CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added/Changed/Deprecated/Removed/Fixed/Security: YOUR CHANGE HERE
 
+## [1.2.4](2021-05-05)
+
+* Fixed: Dynamic types definition where type A references type B referencing type A.
+
+## [1.2.3](2021-04-12)
+
+* Fixed: Total count on paginated resources
+
+## [1.2.2](2021-02-19)
+
+* Fixed: Incorrect type resolution for required list type fields in model declaration.
+
 ## [1.2.1](2021-02-17)
 
 * Fixed: Incorrect scalar types resolution is fixed. No more `type mismatch between ID / ID`

data/Gemfile

@@ -5,9 +5,9 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 group :development do
-  gem 'rubocop', '0.91.0'
-  gem 'rubocop-performance', '~> 1.8', '>= 1.8.1'
-  gem 'rubocop-rspec', '~> 1.44', '>= 1.44.1'
+  gem 'rubocop', '1.5.2'
+  gem 'rubocop-performance'
+  gem 'rubocop-rspec'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_rails (1.2.1)
+    graphql_rails (1.2.6)
       activesupport (>= 4)
       graphql (~> 1.12, >= 1.12.4)
 
@@ -63,7 +63,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+    ast (2.4.2)
     bson (4.11.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -78,7 +78,7 @@ GEM
     erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    graphql (1.12.4)
+    graphql (1.12.10)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
@@ -90,9 +90,11 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.6.1)
     minitest (5.14.2)
     mongo (2.13.1)
       bson (>= 4.8.2, < 5.0.0)
@@ -100,11 +102,11 @@ GEM
       activemodel (>= 5.1, < 6.1)
       mongo (>= 2.7.0, < 3.0.0)
     nio4r (2.5.4)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -144,8 +146,8 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -159,24 +161,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (0.91.0)
+    rubocop (1.5.2)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.4.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
     rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (1.44.1)
-      rubocop (~> 0.87)
-      rubocop-ast (>= 0.7.1)
-    ruby-progressbar (1.10.1)
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
     simplecov (0.19.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -211,9 +213,9 @@ DEPENDENCIES
   rails (~> 6)
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (= 0.91.0)
-  rubocop-performance (~> 1.8, >= 1.8.1)
-  rubocop-rspec (~> 1.44, >= 1.44.1)
+  rubocop (= 1.5.2)
+  rubocop-performance
+  rubocop-rspec
   simplecov
 
 BUNDLED WITH

data/docs/README.md

@@ -1,6 +1,6 @@
 # GraphqlRails
 
-[![Build Status](https://travis-ci.org/samesystem/graphql_rails.svg?branch=master)](https://travis-ci.org/samesystem/graphql_rails)
+![Build Status](https://github.com/samesystem/graphql_rails/workflows/Ruby/badge.svg?branch=master)
 [![codecov](https://codecov.io/gh/samesystem/graphql_rails/branch/master/graph/badge.svg)](https://codecov.io/gh/samesystem/graphql_rails)
 [![Documentation](https://readthedocs.org/projects/ansicolortags/badge/?version=latest)](https://samesystem.github.io/graphql_rails)
 

data/lib/graphql_rails/attributes/attributable.rb

@@ -21,11 +21,9 @@ module GraphqlRails
       end
 
       def required?
-        if @required.nil?
-          attribute_name_parser.required? || !initial_type.to_s[/!$/].nil?
-        else
-          @required
-        end
+        return @required unless @required.nil?
+
+        attribute_name_parser.required? || !initial_type.to_s[/!$/].nil? || initial_type.is_a?(GraphQL::Schema::NonNull)
       end
 
       def required

data/lib/graphql_rails/input_configurable.rb

@@ -3,9 +3,14 @@
 module GraphqlRails
   # contains configuration options related with inputs
   module InputConfigurable
-    def permit(*no_type_attributes, **typed_attributes)
-      no_type_attributes.each { |attribute| permit_input(attribute) }
-      typed_attributes.each { |attribute, type| permit_input(attribute, type: type) }
+    def permit(*args)
+      args.each do |arg|
+        if arg.is_a? Hash
+          arg.each { |attribute, type| permit_input(attribute, type: type) }
+        else
+          permit_input(arg)
+        end
+      end
       self
     end
 

data/lib/graphql_rails/model/build_connection_type/count_items.rb

@@ -27,7 +27,7 @@ module GraphqlRails
         attr_reader :graphql_object
 
         def list
-          graphql_object.nodes
+          graphql_object.items
         end
 
         def active_record?

data/lib/graphql_rails/model/build_connection_type.rb

@@ -33,7 +33,7 @@ module GraphqlRails
           field :total, Integer, null: false
 
           def total
-            CountItems.call(self)
+            CountItems.call(object)
           end
         end
       end

data/lib/graphql_rails/model/configurable.rb

@@ -5,6 +5,14 @@ module GraphqlRails
     # contains methods which are shared between various configurations
     # expects `default_name` to be defined
     module Configurable
+      def initialize_copy(other)
+        super
+        @name = nil
+        @type_name = nil
+        @description = nil
+        @attributes = other.attributes.transform_values(&:dup)
+      end
+
       def attributes
         @attributes ||= {}
       end

data/lib/graphql_rails/model/configuration.rb

@@ -22,7 +22,6 @@ module GraphqlRails
         @connection_type = nil
         @graphql_type = nil
         @input = other.instance_variable_get(:@input)&.transform_values(&:dup)
-        @attributes = other.instance_variable_get(:@attributes)&.transform_values(&:dup)
       end
 
       def attribute(attribute_name, **attribute_options)
@@ -68,6 +67,14 @@ module GraphqlRails
         @connection_type ||= BuildConnectionType.call(graphql_type)
       end
 
+      def with_ensured_fields!
+        return self if @graphql_type.blank?
+
+        reset_graphql_type if attributes.any? && graphql_type.fields.length != attributes.length
+
+        self
+      end
+
       private
 
       attr_reader :model_class
@@ -75,6 +82,16 @@ module GraphqlRails
       def default_name
         @default_name ||= model_class.name.split('::').last
       end
+
+      def reset_graphql_type
+        @graphql_type = FindOrBuildGraphqlType.call(
+          name: name,
+          description: description,
+          attributes: attributes,
+          type_name: type_name,
+          force_define_attributes: true
+        )
+      end
     end
   end
 end

data/lib/graphql_rails/model/find_or_build_graphql_type.rb

@@ -10,20 +10,21 @@ module GraphqlRails
 
       include ::GraphqlRails::Service
 
-      def initialize(name:, description:, attributes:, type_name:)
+      def initialize(name:, description:, attributes:, type_name:, force_define_attributes: false)
         @name = name
         @description = description
         @attributes = attributes
         @type_name = type_name
+        @force_define_attributes = force_define_attributes
       end
 
       def call
-        klass.tap { add_fields_to_graphql_type if new_class? }
+        klass.tap { add_fields_to_graphql_type if new_class? || force_define_attributes }
       end
 
       private
 
-      attr_reader :name, :description, :attributes, :type_name
+      attr_reader :name, :description, :attributes, :type_name, :force_define_attributes
 
       delegate :klass, :new_class?, to: :type_class_finder
 

data/lib/graphql_rails/model/input.rb

@@ -14,11 +14,6 @@ module GraphqlRails
         @input_name_suffix = input_name_suffix
       end
 
-      def initialize_copy(other)
-        super
-        @attributes = other.instance_variable_get(:@attributes)&.transform_values(&:dup)
-      end
-
       def graphql_input_type
         @graphql_input_type ||= BuildGraphqlInputType.call(
           name: name, description: description, attributes: attributes

data/lib/graphql_rails/model.rb

@@ -28,7 +28,7 @@ module GraphqlRails
 
       def graphql
         @graphql ||= Model::Configuration.new(self)
-        yield(@graphql) if block_given?
+        @graphql.tap { |it| yield(it) }.with_ensured_fields! if block_given?
         @graphql
       end
     end

data/lib/graphql_rails/tasks/dump_graphql_schema.rb

@@ -9,8 +9,8 @@ module GraphqlRails
 
     attr_reader :name
 
-    def self.call(*args)
-      new(*args).call
+    def self.call(**args)
+      new(**args).call
     end
 
     def initialize(name:)

data/lib/graphql_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.6
 platform: ruby
 authors:
 - Povilas Jurčys
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -128,19 +128,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
-description:
+description: 
 email:
 - po.jurcys@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -232,7 +232,7 @@ homepage: https://github.com/samesystem/graphql_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -247,8 +247,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: Rails style structure for GraphQL API.
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.7.1
-before_install: gem install bundler -v 2.1.4