graphql-rails-api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad933edeeaa5ed8f37ea3b5ba376670976ef245fff20d33fc7fbdfdf7c5b4fda
-  data.tar.gz: 54fa2e6d034e4ff46124f21980e9a3aa947cbd22208872a0595a651ad0f3e403
+  metadata.gz: da727dde4584527a0597124ff476b0366f056ec29f46b51e0886a51f5c7fe00c
+  data.tar.gz: 1ccc03fa9aaf3b81e0df7135571601df989a65b6e6b50d9940ca7329d2a69486
 SHA512:
-  metadata.gz: 21cbb6dd1a71aa888b3fc3b6b0fc71ae09ead22dece2d4a1a85b61ea6f0eaf44b39e3fab8687f2bc25e08faaade7b8a1e6cdbead36b7a501d252e07349ee7976
-  data.tar.gz: 9e806b335391d28de6a3b5561d312730c1fdaab8e76edb501d3cdb313dbb018d79c573e1ce3b324d8256ba2db32aab20a3906ff8273339e5fdde8a0fc00e58f5
+  metadata.gz: d4fc5d6d2e90a155c8dc712b739dc2e2921d12121b46168a7549c2bb16108c5c77620a84c3f6fda467de239d8ced4ddf36db3f9bf8203cabc67a4989cd6248a3
+  data.tar.gz: ca77d437d4f161d16555da1c8dabf16207d798291c883b1f33309467a7470d121f75314f0e8d37f6a4e998cbc0317118ec70d61d4eb6e751288390b1d902b3c2

data/lib/generators/graphql_rails_api/install_generator.rb

@@ -342,7 +342,7 @@ module GraphqlRailsApi
             end
 
             def index
-              Graphql::HydrateGraphqlQuery.new(model.all, @context, user: user).run
+              Graphql::HydrateQuery.new(model.all, @context, user: user).run
             end
 
             def show

data/lib/generators/graphql_resource/graphql_resource_generator.rb

@@ -60,11 +60,14 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
     @has_many = []
     @many_to_many = []
     @mutations_directory = "#{graphql_resource_directory(@resource)}/mutations"
+    @belongs_to_fields = {}
 
     @args = args.each_with_object({}) do |f, hash|
       next if f.split(':').count != 2
       case f.split(':').first
-      when 'belongs_to' then hash["#{f.split(':').last.singularize}_id"] = @id_db_type
+      when 'belongs_to' then
+        hash["#{f.split(':').last.singularize}_id"] = @id_db_type
+        @belongs_to_fields["#{f.split(':').last.singularize}_id"] = @id_db_type
       when 'has_many' then @has_many << f.split(':').last.pluralize
       when 'many_to_many' then @many_to_many << f.split(':').last.pluralize
       else
@@ -72,8 +75,6 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
       end
     end
 
-    @id_fields = @args.select { |k, _| k.end_with?('_id') }
-
     @fields_to_migration = @args.map do |f|
       "t.#{f.reverse.join(' :')}"
     end.join("\n      ")
@@ -203,7 +204,7 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
       add_has_many_fields_to_type(resource, f)
       add_belongs_to_field_to_type(resource, f)
     end
-    @id_fields.each do |f, _|
+    @belongs_to_fields.each do |f, _|
       add_has_many_fields_to_type(f.gsub('_id', ''), resource)
       add_belongs_to_field_to_type(f.gsub('_id', ''), resource)
     end
@@ -260,7 +261,7 @@ t.#{@id_db_type} :#{resource.underscore.singularize}_id
       add_to_model(resource, "has_many :#{field.pluralize}")
       add_to_model(field, "belongs_to :#{resource.singularize}")
     end
-    @id_fields.each do |k, _|
+    @belongs_to_fields.each do |k, _|
       field = k.gsub('_id', '')
       add_to_model(field, "has_many :#{resource.pluralize}")
       add_to_model(resource, "belongs_to :#{field.singularize}")
@@ -272,7 +273,7 @@ t.#{@id_db_type} :#{resource.underscore.singularize}_id
       field_name = k
       field_type = types_mapping(v)
       res = "#{input_type ? 'argument' : 'field'} :#{field_name}, #{field_type}"
-      if !input_type && field_name.ends_with?('_id')
+      if !input_type && field_name.ends_with?('_id') && @belongs_to_fields.key?(field_name)
         res += "\n  field :#{field_name.gsub('_id', '')}, " \
           "!#{field_name.gsub('_id', '').pluralize.camelize}::Type"
       end

data/lib/graphql/rails/api/version.rb

@@ -1,7 +1,7 @@
 module Graphql
   module Rails
     module Api
-      VERSION = '0.1.4'.freeze
+      VERSION = '0.1.5'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - poilon
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Graphql rails api framework to create easily graphql api with rails