Skip to content

Commit 6d0eaaf

Browse files
authored
Merge pull request #10 from ajsharp/fix-naming-default
Fix the default options of model_type and input generators
2 parents 07aac56 + 41559b0 commit 6d0eaaf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/generators/gql/input_generator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class InputGenerator < Rails::Generators::Base
1212
class_option :namespace, type: :string, default: 'Types::Input'
1313

1414
def generate_input_type
15-
name = options['name'] || model_name
15+
name = options['name'].nil? ? "#{model_name}Input" : options['name']
1616
superclass = options['superclass']
1717

1818
ignore = ['id', 'created_at', 'updated_at']
@@ -23,7 +23,7 @@ def generate_input_type
2323
end
2424

2525
code = class_with_fields(options['namespace'], name, superclass, fields)
26-
file_name = File.join(root_directory(options['namespace']), "#{name.underscore}_input.rb")
26+
file_name = File.join(root_directory(options['namespace']), "#{name.underscore}.rb")
2727

2828
create_file file_name, code
2929
end

lib/generators/gql/model_type_generator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ModelTypeGenerator < Rails::Generators::Base
1212
class_option :namespace, type: :string, default: 'Types'
1313

1414
def type
15-
name = options['name'] || model_name
15+
name = options['name'].nil? ? "#{model_name}Type" : options['name']
1616

1717
superclass = options['superclass']
1818

@@ -22,7 +22,7 @@ def type
2222
end
2323

2424
code = class_with_fields(options['namespace'], name, superclass, fields)
25-
file_name = File.join(root_directory(options['namespace']), "#{name.underscore}_type.rb")
25+
file_name = File.join(root_directory(options['namespace']), "#{name.underscore}.rb")
2626

2727
create_file file_name, code
2828
end

0 commit comments

Comments
 (0)