graphql_scaffold_fan 0.2.5 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd748283918d5930f5362003773250fee8431e809120a3cbef546662110b404
-  data.tar.gz: 533cc9e4867e83c327da5b3121d9a111f289670a185a0ef8cb5352aa3ceb63e8
+  metadata.gz: dcfe0933232990b0284c47835fed6627498363ee486604fafa3d5dd60c268aba
+  data.tar.gz: ff168a50bb8759d30a95e5f3d346565d75bc350fce76a54dd2348ed1c6070eb0
 SHA512:
-  metadata.gz: dfdaa2f0554c2e30367137be386784fa4d1eba0853a07855d0af62346843eaa950fa0a65dd5bb26d833fd472c1bc28e535f450bcc655483a143c55f9adeed13b
-  data.tar.gz: f3dbf2b6fcb54f85e0bf259398b99aee011fc60c045bb361ab60c36beee701c5c8a79f83c36979140807bd697335eacdfc2a65d5a43bb1ac992ad01a0358fe7d
+  metadata.gz: bbc4d8acb3b29d051c3bc05a01c3e8aeb9c8e7e52f770b48ec311e8f3a8522933855b3f6693169ce4085f1fd184620dc33e46378267e385799a7794d4e48f096
+  data.tar.gz: 772501a125b03fa195c19b8cd45881746e31a92a5a485206eeea58f69435f8b6bd5cfb3f1b26f18bd165d3a53f18ca0c9fe040e6788ddc569275bb713eb43a1b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_scaffold_fan (0.2.5)
+    graphql_scaffold_fan (0.2.8)
       graphql
       graphql_playground-rails
 

data/lib/generators/graphql_scaffold/init_generator.rb

@@ -40,6 +40,28 @@ module GraphqlScaffold
         end
       end
 
+      def create_mutation_type_file
+        mutation_type_dir_path = 'app/graphql/types/admin'
+        generator_dir_path = mutation_type_dir_path
+        generator_path = generator_dir_path + '/mutation_type.rb'
+
+        FileUtils.mkdir_p(mutation_type_dir_path) unless File.exist?(mutation_type_dir_path)
+        FileUtils.mkdir_p(generator_dir_path) unless File.exist?(generator_dir_path)
+
+        template 'mutation_type.haml', generator_path if !File.exist?(generator_path)
+      end
+
+      def create_query_type_file
+        query_type_dir_path = 'app/graphql/types/admin'
+        generator_dir_path = query_type_dir_path
+        generator_path = generator_dir_path + '/query_type.rb'
+
+        FileUtils.mkdir_p(query_type_dir_path) unless File.exist?(query_type_dir_path)
+        FileUtils.mkdir_p(generator_dir_path) unless File.exist?(generator_dir_path)
+
+        template 'query_type.haml', generator_path if !File.exist?(generator_path)
+      end
+
       def add_route
         route_dir_path = 'config'
         route_file_path = route_dir_path + '/routes.rb'

data/lib/generators/graphql_scaffold/mutation_generator.rb

@@ -22,7 +22,7 @@ module GraphqlScaffold
         generator_dir_path = admin_mutation_dir_path + ("/#{@module_name.underscore}" if @module_name.present?).to_s
         @generator_path = generator_dir_path + "/#{file_name}s"
 
-        admin_mutation_test_dir_path = 'spec/graphql/mutations/admin'
+        admin_mutation_test_dir_path = 'spec/requests/mutations/admin'
         generator_test_dir_path = admin_mutation_test_dir_path + (if @module_name.present?
                                                                     "/#{@module_name.underscore}"
                                                                   end).to_s
@@ -104,7 +104,7 @@ module GraphqlScaffold
         end
       end
 
-      def create_mutation_type_file
+      def write_to_mutation_type_file
         mutation_type_dir_path = 'app/graphql/types/admin'
         generator_dir_path = mutation_type_dir_path
         generator_path = generator_dir_path + '/mutation_type.rb'
@@ -122,13 +122,6 @@ module GraphqlScaffold
           template 'mutation_type.haml', generator_path
         end
       end
-
-      def create_test_file
-        test_dir_path = 'spec/requests/mutations'
-        test_file_path = test_dir_path + "/#{file_name}_spec.rb"
-        FileUtils.mkdir_p(test_dir_path) unless File.exist?(test_dir_path)
-        template 'mutation_test.haml', test_file_path
-      end
     end
   end
 end

data/lib/generators/graphql_scaffold/type_generator.rb

@@ -11,10 +11,12 @@ module GraphqlScaffold
           dst_dir = 'app/graphql/types/admin'
           if File.exist?("app/graphql/types/#{file_name}_type.rb")
             FileUtils.mv(src_file, dst_dir)
+            p "Move #{file_name}_type.rb location"
             file = File.open("#{dst_dir}/#{file_name}_type.rb")
             file_data = file.read
-            new_file_data = file_data.insert(21, 'Admin::')
+            new_file_data = file_data.insert(52, 'Admin::')
             File.write(file, new_file_data)
+            p "Write to #{file_name}_type.rb"
           else
             p "can not find #{file_name}_type file to move"
           end
@@ -36,7 +38,7 @@ module GraphqlScaffold
         template 'admin_filter.haml', generator_path
       end
 
-      def create_query_type_file
+      def write_to_query_type_file
         query_type_dir_path = 'app/graphql/types/admin'
         generator_dir_path = query_type_dir_path
         generator_path = generator_dir_path + '/query_type.rb'
@@ -67,7 +69,7 @@ module GraphqlScaffold
       end
 
       def create_test_file
-        test_dir_path = 'spec/requests/queries'
+        test_dir_path = 'spec/requests/queries/admin'
         test_file_path = test_dir_path + "/#{file_name}_spec.rb"
         FileUtils.mkdir_p(test_dir_path) unless File.exist?(test_dir_path)
         template 'query_test.haml', test_file_path

data/lib/generators/templates/admin_schema.haml

@@ -4,17 +4,19 @@
 class <%= class_name %>AdminSchema < GraphQL::Schema
   use GraphQL::Tracing::NewRelicTracing, set_transaction_name: true
   use GraphqlDevise::SchemaPlugin.new(
-    query: Types::Query::AdminUserQueryType,
-    mutation: Types::Mutation::AdminUserMutationType,
+    query:            Types::Admin::QueryType,
+    mutation:         Types::Admin::MutationType,
     resource_loaders: [
-      GraphqlDevise::ResourceLoader.new(AdminUser, only: %i[login logout])
+      GraphqlDevise::ResourceLoader.new(AdminUser,
+                                        operations: {
+                                          login: Mutations::Admin::Auth::Login
+                                        },
+                                        only:       %i[login logout])
     ]
   )
 
-  mutation(Types::Mutation::AdminUserMutationType)
-  query(Types::Query::AdminUserQueryType)
-
-  use GraphQL::Batch
+  mutation(Types::Admin::MutationType)
+  query(Types::Admin::QueryType)
 
   # Union and Interface Resolution
   def self.resolve_type(_abstract_type, _obj, _ctx)
@@ -26,17 +28,17 @@ class <%= class_name %>AdminSchema < GraphQL::Schema
   # Relay-style Object Identification:
 
   # Return a string UUID for `object`
-  def self.id_from_object(object, type_definition, _query_ctx)
+  def self.id_from_object(object, type_definition, query_ctx)
     # Here's a simple implementation which:
     # - joins the type name & object.id
     # - encodes it with base64:
-    GraphQL::Schema::UniqueWithinType.encode(type_definition.name, object.id)
+    # GraphQL::Schema::UniqueWithinType.encode(type_definition.name, object.id)
   end
 
   # Given a string UUID, find the object
-  def self.object_from_id(id, _query_ctx)
+  def self.object_from_id(id, query_ctx)
     # For example, to decode the UUIDs generated above:
-    type_name, item_id = GraphQL::Schema::UniqueWithinType.decode(id)
+    # type_name, item_id = GraphQL::Schema::UniqueWithinType.decode(id)
     #
     # Then, based on `type_name` and `id`
     # find an object in your application

data/lib/generators/templates/mutation_create_test.haml

@@ -13,7 +13,6 @@ RSpec.describe Mutations::Admin::<%= class_name %>s::Create<%= class_name %>, ty
       GQL
 
       expect do
-        sign_in admin_user
         post '/api/admin/graphql', headers: admin_user.create_new_auth_token, params: { query: query, variables: variables }
         expect(response).to have_http_status(:success)
         json = JSON.parse(response.body)

data/lib/generators/templates/mutation_delete_test.haml

@@ -8,8 +8,6 @@ RSpec.describe Mutations::Admin::<%= class_name %>s::Delete<%= class_name %>, ty
 
   describe '.resolve' do
     it 'should delete' do
-      admin_user = create(:admin_user)
-      sign_in admin_user
 
       variables = <<~GQL
         {

data/lib/generators/templates/mutation_type.haml

@@ -3,7 +3,7 @@
 module Types
   module Admin
     class MutationType < Types::BaseObject
-      has_admin_mutation :<%= class_name %>
+
     end
   end
 end

data/lib/generators/templates/mutation_update_test.haml

@@ -8,7 +8,6 @@ RSpec.describe Mutations::Admin::<%= class_name %>s::Update<%= class_name %>, ty
 
   describe '.resolve' do
     it 'should update' do
-      sign_in admin_user
 
       variables = <<~GQL
         {

data/lib/generators/templates/query_type.haml

@@ -3,7 +3,7 @@
 module Types
   module Admin
     class QueryType < Types::BaseObject
-      has_admin_fields :<%= class_name %>
+
     end
   end
 end

data/lib/graphql_scaffold_fan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlScaffoldFan
-  VERSION = '0.2.5'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_scaffold_fan
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: ruby
 authors:
 - Fan Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql