graphql_scaffold_fan 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd16366de26333651bededf94e3b522ddc3f23e3beb39fb885292cc39afca52a
-  data.tar.gz: 30bb023a7cf18328365147f83b405406fadcbff4d7e498032e621f5db24b5f90
+  metadata.gz: eed7880738bc1e560999cacc4cc80284a4a353eff9ce4db9e804248b6fecc82a
+  data.tar.gz: ebf38352c1e52f9bba28a8814280b64d7ee7dd5a961397da44cce847950861d4
 SHA512:
-  metadata.gz: 21b1cf73b2627efbb3f89b25c839b826d59f2c930842f86e3be8c8b0209d80e2792d5483247586f2c66aac88a70023a0d25d3026294583224322a637da01aefd
-  data.tar.gz: 0f18d48487e041e3568e5e95c3da2a0a5612a04a7d2be2f082cefae6be80173018bb60937c00b81772777ac004fb96338b436cde95cca376d83f661232112fef
+  metadata.gz: 37f6663b95a871a0df9ede7b467f9e03eadf789dde0f9ba17aa699dab91f58d9f6abc6b46acc4c13b566451a3a797993fcb7f9a6d1c3163ba7325ee59fc6f7a5
+  data.tar.gz: 67473a3eb62b1099bfe3f656811a52ba3ca786acd3f9e317726d1a81c2ee072ed6590aa95639e9c73a59ee25de7ef035888f76fab6b88ee7d3559bf607d3914b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_scaffold_fan (0.2.4)
+    graphql_scaffold_fan (0.2.7)
       graphql
       graphql_playground-rails
 
@@ -73,7 +73,7 @@ GEM
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    graphql (2.0.11)
+    graphql (2.0.12)
     graphql_playground-rails (2.1.0)
       rails (>= 5.1.0)
     i18n (1.12.0)
@@ -88,7 +88,7 @@ GEM
     mini_mime (1.1.2)
     minitest (5.16.2)
     nio4r (2.5.8)
-    nokogiri (1.13.7-x86_64-darwin)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
     racc (1.6.0)
     rack (2.2.4)
@@ -129,7 +129,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)

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'
@@ -49,7 +71,7 @@ module GraphqlScaffold
         if File.exist?(route_file_path)
           file = File.open(route_file_path)
           file_data = file.read
-          new_file_data = file_data.insert(-6, "\n  mount GraphqlPlayground::Rails::Engine, at: '/graphiql_admin', graphql_path: 'api/admin/graphql', as: :admin_graphiql\n  post 'api/admin/graphql', to: 'graphql_admin#execute'")
+          new_file_data = file_data.insert(-6, "\n  mount GraphqlPlayground::Rails::Engine, at: '/graphiql_admin', graphql_path: 'api/admin/graphql', as: :admin_graphiql\n  post 'api/admin/graphql', to: 'admin_graphql#execute'")
           File.write(file, new_file_data)
           p 'Write to routes.rb successfully'
         else

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'

data/lib/generators/graphql_scaffold/type_generator.rb

@@ -36,7 +36,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 +67,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_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/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.4'
+  VERSION = '0.2.7'
 end

metadata

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