ibrain-core 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce7566a45bf8104c5716af6292a1c42310a04b6816b39344f150af14f1dd021b
-  data.tar.gz: b0dad36cd1f5d34c7e3ba1de7eed8a75be9c6eae6fc2338942010da8212f1724
+  metadata.gz: 1208ea7c11b96ef277bcd34d9b8a1ff21b78c282c26a4e6c93d6ce3c73d3e303
+  data.tar.gz: 3989806e90af2f13d72ff04453dfc48f270e51ccb6d67d5bc9876cb475fab067
 SHA512:
-  metadata.gz: 9059a3849ba826fe227d13a6cfb85ee5f6753e49aed78bf1b92a268e7181472293375cfdb134cd1bb2179c0ac8305d6b6a3dd14ddc3003e0be16111f3f248c12
-  data.tar.gz: 57a41af75b233f6de3376a3918fca42f46e84c7fa50eec9796244e136018e794625bd7243285efb6232c6d6ca3636b5d7563e5df03be7be74f76a50c8311cae6
+  metadata.gz: 696a58668b7d169eaa712fcb729aa334b9e333df9849fdd578894f3ec6a451457eab9c5f2066f7e12fa245f6fe67a60af63e07b69649882fbacf81a42a02f5f0
+  data.tar.gz: 1aa43fb20f329d2a23e61bbd769f8ccc75b173c88febe9c6e3bdedecb69248926e9dd4c04e4fd3ba88ef8239475ef3c251681c72f6a41d55cb13fbfe6b4c4ccf

data/app/graphql/ibrain/resolvers/base_aggregate.rb

@@ -4,6 +4,10 @@ module Ibrain
   module Resolvers
     class BaseAggregate < BaseResolver
       type Ibrain::Types::BaseObject.connection_type, null: false
+
+      argument :where, Ibrain::Types::FilterType, required: false, default_value: nil
+      argument :limit, Int, required: false, default_value: 10
+      argument :offset, Int, required: false, default_value: 0
     end
   end
 end

data/app/graphql/ibrain/resolvers/base_resolver.rb

@@ -5,10 +5,6 @@ module Ibrain
     class BaseResolver < GraphQL::Schema::Resolver
       argument_class ::Ibrain::Types::BaseArgument
 
-      argument :filter, Ibrain::Types::FilterType, required: false, default_value: nil
-      argument :limit, Int, required: false, default_value: 10
-      argument :offset, Int, required: false, default_value: 0
-
       def current_user
         context.fetch(:current_user)
       end

data/app/graphql/ibrain/types/base_api_connection.rb

@@ -6,10 +6,10 @@ module Ibrain
       # add `nodes` and `pageInfo` fields, as well as `edge_type(...)` and `node_nullable(...)` overrides
       include GraphQL::Types::Relay::ConnectionBehaviors
 
-      field :count, Integer, null: false, camelize: false
+      field :aggregate, Ibrain::Types::AggregateType, null: false, camelize: false
 
-      def count
-        object.items.size
+      def aggregate
+        Ibrain::Aggregate.new(object.items.size)
       end
     end
   end

data/app/graphql/ibrain/types/base_connection.rb

@@ -9,7 +9,7 @@ module Ibrain
       field :aggregate, Ibrain::Types::AggregateType, null: false, camelize: false
 
       def aggregate
-        Ibrain::Aggregate.new(object.uniq.size)
+        Ibrain::Aggregate.new(object.items.size)
       end
     end
   end

data/app/graphql/ibrain/types/base_object.rb

@@ -10,13 +10,7 @@ module Ibrain
 
       field_class ::Ibrain::Types::BaseField
 
-      def self.overridden_graphql_name(name = '')
-        to_s.demodulize.gsub('Type', '').singularize.classify.constantize.table_name
-      rescue StandardError
-        return to_s.demodulize if name.blank?
-
-        name
-      end
+      field :name, String, null: true
     end
   end
 end

data/app/graphql/ibrain/types/base_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Ibrain
+  module Types
+    class BaseType < BaseObject
+      def self.graphql_name(name = "")
+        return name if name.present?
+
+        self.name.demodulize.gsub('Type', '').classify.constantize.table_name
+      end
+    end
+  end
+end

data/lib/generators/ibrain/graphql/mutation_generator.rb

@@ -18,6 +18,7 @@ module Ibrain
 
       argument :name, type: :string
       class_option :model, type: :string, default: nil
+      class_option :prefix, type: :string, default: nil
 
       def initialize(args, *options) # :nodoc:
         # Unfreeze name in case it's given as a frozen string
@@ -42,20 +43,30 @@ module Ibrain
 
         template "mutation.erb", "#{options[:directory]}/mutations/#{file_name}.rb"
 
-        sentinel = /class .*MutationType\s*<\s*[^\s]+?\n/m
         in_root do
           gsub_file "#{options[:directory]}/types/mutation_type.rb", /  \# TODO: Add Mutations as fields\s*\n/m, ""
-          inject_into_file "#{options[:directory]}/types/mutation_type.rb", "    field :#{field_name}, mutation: Mutations::#{mutation_name}\n", after: sentinel, verbose: false, force: false
+          inject_into_file "#{options[:directory]}/types/mutation_type.rb", "\n    field :#{field_name}, mutation: Mutations::#{mutation_name} \n  ", before: "end\nend", verbose: true, force: true
         end
       end
 
       private
 
       def assign_names!(name)
-        @field_name = name.camelize.underscore
-        @mutation_name = name.camelize(:upper)
-        @file_name = name.camelize.underscore
-        @model_name = options[:model].blank? ? 'Post' : options[:model].capitalize
+        underscore_name = name&.camelize&.underscore
+        prefix = options[:prefix].try(:underscore)
+        @model_name = options[:model].blank? ? 'Post' : options[:model].try(:capitalize)
+
+        if prefix.blank?
+          @mutation_name = name.camelize(:upper)
+          @file_name = underscore_name
+          @field_name = underscore_name
+
+          return
+        end
+
+        @mutation_name = "#{prefix.try(:capitalize)}::#{name.camelize(:upper)}"
+        @file_name = "#{prefix}/#{underscore_name}"
+        @field_name = "#{prefix}_#{underscore_name}"
       end
     end
   end

data/lib/generators/ibrain/graphql/resolver_generator.rb

@@ -26,10 +26,9 @@ module Ibrain
 
         template "resolver.erb", "#{options[:directory]}/resolvers/#{file_name}.rb"
 
-        sentinel = /class .*QueryType\s*<\s*[^\s]+?\n/m
         in_root do
           gsub_file "#{options[:directory]}/types/query_type.rb", /  \# TODO: Add Resolvers as fields\s*\n/m, ""
-          inject_into_file "#{options[:directory]}/types/query_type.rb", "    field :#{field_name}, resolver: Resolvers::#{resolver_name}\n\n", after: sentinel, verbose: false, force: false
+          inject_into_file "#{options[:directory]}/types/query_type.rb", "\n    field :#{field_name}, resolver: Resolvers::#{resolver_name} \n  ", before: "end\nend", verbose: true, force: true
         end
       end
     end

data/lib/generators/ibrain/graphql/resolvers_generator.rb

@@ -18,6 +18,7 @@ module Ibrain
 
       argument :name, type: :string
       class_option :model, type: :string, default: nil
+      class_option :prefix, type: :string, default: nil
 
       def initialize(args, *options) # :nodoc:
         # Unfreeze name in case it's given as a frozen string
@@ -43,20 +44,31 @@ module Ibrain
         template "resolvers.erb", "#{options[:directory]}/resolvers/#{file_name}.rb"
         template "aggregate.erb", "#{options[:directory]}/resolvers/#{file_name}_aggregate.rb"
 
-        sentinel = /class .*QueryType\s*<\s*[^\s]+?\n/m
         in_root do
           gsub_file "#{options[:directory]}/types/query_type.rb", /  \# TODO: Add Resolvers as fields\s*\n/m, ""
-          inject_into_file "#{options[:directory]}/types/query_type.rb", "    field :#{field_name}, resolver: Resolvers::#{resolver_name}\n    field :#{field_name}_aggregate, resolver: Resolvers::#{resolver_name}Aggregate\n\n", after: sentinel, verbose: false, force: false
+          inject_into_file "#{options[:directory]}/types/query_type.rb", "\n    field :#{field_name}, resolver: Resolvers::#{resolver_name}\n    field :#{field_name}_aggregate, resolver: Resolvers::#{resolver_name}Aggregate \n  ", before: "end\nend", verbose: true, force: true
         end
       end
 
       private
 
       def assign_names!(name)
-        @field_name = name.camelize.underscore
-        @resolver_name = name.camelize(:upper)
-        @file_name = name.camelize.underscore
-        @model_name = options[:model].blank? ? 'Post' : options[:model].capitalize
+        underscore_name = name&.camelize&.underscore
+        prefix = options[:prefix].try(:underscore)
+
+        @model_name = options[:model].blank? ? 'Post' : options[:model].try(:capitalize)
+
+        if prefix.blank?
+          @resolver_name = name.camelize(:upper)
+          @file_name = underscore_name
+          @field_name = underscore_name
+
+          return
+        end
+
+        @resolver_name = "#{prefix.try(:capitalize)}::#{name.camelize(:upper)}"
+        @file_name = "#{prefix}/#{underscore_name}"
+        @field_name = "#{prefix}_#{underscore_name}"
       end
     end
   end

data/lib/generators/ibrain/graphql/templates/mutation.erb

@@ -7,7 +7,7 @@ module Mutations
     # description
 
     # TODO: define return fields
-    field :<%= model_name.underscore %>, Types::<%= model_name %>Type, null: false, description: 'Record Type for mutation response'
+    field :<%= model_name.underscore %>, Types::Objects::<%= model_name %>Type, null: false, description: 'Record Type for mutation response'
 
     # TODO: define arguments
     # argument :name, String, required: true

data/lib/generators/ibrain/graphql/templates/resolver.erb

@@ -9,11 +9,11 @@ module Resolvers
     # TODO: define return fields
     type Types::Objects::<%= model_name.capitalize %>Type, null: false
 
-    argument :id, ID, required: false, description: 'TODO: describe about this argument'
+    argument :id, ID, required: true, description: 'TODO: describe about this argument'
 
     # TODO: define resolve method
     def resolve(args)
-      <%= model_name.capitalize %>Repository.find args[:id]
+      <%= model_name.capitalize %>Repository.find(args)
     end
   end
 end

data/lib/ibrain/core/version.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Ibrain
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 
   def self.ibrain_version
     VERSION
   end
 
   def self.previous_ibrain_minor_version
-    '0.3.5'
+    '0.3.6-rc.1'
   end
 
   def self.ibrain_gem_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibrain-core
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Tai Nguyen Van
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -208,6 +208,7 @@ files:
 - app/graphql/ibrain/types/base_node.rb
 - app/graphql/ibrain/types/base_object.rb
 - app/graphql/ibrain/types/base_scalar.rb
+- app/graphql/ibrain/types/base_type.rb
 - app/graphql/ibrain/types/base_union.rb
 - app/graphql/ibrain/types/filter_type.rb
 - app/graphql/ibrain/types/node_type.rb