Merge pull request #2 from svtek/newRelay

upgradeToNewRelay

Author: adamdilek

.gitignore

@@ -1,2 +1,2 @@
-.gem
+*.gem
 .idea/

Gemfile.lock

@@ -100,6 +100,3 @@ PLATFORMS
 
 DEPENDENCIES
   rails
-
-BUNDLED WITH
-   1.11.2

lib/generators/graphql/graphql_helpers.rb

@@ -27,8 +27,8 @@ def create_type(model)
   description '#{model.to_s} type'
 
   interfaces [NodeIdentification.interface]
-
-  field :id, field: GraphQL::Relay::GlobalIdField.new('#{model.to_s}')
+  
+  global_id_field :id
   # End of fields
 end
         FILE
@@ -41,7 +41,7 @@ def add_fields(model)
           next if columns[k].name == 'id'
 
           if columns[k].type.present?
-            inject_into_file type_path(model), after: "field :id, field: GraphQL::Relay::GlobalIdField.new('#{model.to_s}')\n" do <<-FILE
+            inject_into_file type_path(model), after: "global_id_field :id\n" do <<-FILE
   field :#{columns[k].name}, types.#{type_mapper[columns[k].type]}
             FILE
             end

lib/generators/graphql/init_generator.rb

@@ -4,8 +4,7 @@ class InitGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
 
       def add_gems
-        gem 'graphql'
-        gem 'graphql-relay'
+        gem 'graphql'        
         gem 'graphiql-rails'
         gem 'graphql-formatter'
       end
@@ -36,4 +35,3 @@ def copy_templates
     end
   end
 end
-

lib/generators/graphql/templates/graph/node_identification.rb

@@ -12,4 +12,4 @@
   type_from_object -> (object) do
     (object.class.name + 'Type').constantize
   end
-end
+end

lib/generators/graphql/templates/graph/relay_schema.rb

@@ -1,5 +1,7 @@
 RelaySchema = GraphQL::Schema.new(query: QueryType, mutation: MutationType)
 
+RelaySchema.node_identification = NodeIdentification
+
 module RelaySchemaHelpers
   SCHEMA_DIR  = Rails.root.join('app/assets/javascripts/relay/')
   SCHEMA_PATH = File.join(SCHEMA_DIR, 'schema.json')
@@ -30,4 +32,4 @@ def remove
 
 end
 
-RelaySchema.extend RelaySchemaHelpers
+RelaySchema.extend RelaySchemaHelpers

lib/generators/graphql/templates/graph/types/root_level_type.rb

@@ -4,5 +4,5 @@
 
   interfaces [NodeIdentification.interface]
 
-  field :id, field: GraphQL::Relay::GlobalIdField.new('RootLevel')
-end
+  global_id_field :id
+end