graphiform 0.2.6 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7499ef9e7181b749ac563666f65231e933d047bbdcc39dbe6f708bdb14e8eab9
-  data.tar.gz: 3fc690f7cb20996f420516cceb158ff9aa103b2b7ed1e7bae6ceead0864f4409
+  metadata.gz: 7ee58551bb7e16aeccf79e81c5665e74cfa9bd6750c517b02eaef9f28deefe24
+  data.tar.gz: 1d37cf0e858774a84d88dd87e6bd67c00bfd5266c76ceb7aa656dc612019d275
 SHA512:
-  metadata.gz: 7037e930060d081d86091b0c023fb3b3813b6a487bbe19785ebde5f6824eae27210839eb4174e5ea47f3499464aa346609ffc76838ab5c814063b754fa44393b
-  data.tar.gz: b41292d3ab6b29c3ab9a2eaa8e02c1743f14095ccc88396e3e6602fb1d8e6964b8576885cb95d0006c88509a7befd54450415ce407e0ed31b4bc9f4eeaa38406
+  metadata.gz: 056d9d69dfe38e12fd40dae4b62a758f86dea1daddb8c1f140910a5ea86beb51f1ecbd19a38b624bf51ee654058d4a63f7177781e6dde548c33bd2543d92eecd
+  data.tar.gz: 84db19af1351992f07456ba23197661e8fc3a5843496ec2e2c53641f94786cbc7b8d675fd20566211e8ca419356f5b7d923de1b4da1f2a9a02b080095e80a3b8

data/lib/graphiform/core.rb

@@ -37,6 +37,7 @@ module Graphiform
           end
           @filter.class_eval do
             argument 'OR', [self], required: false
+            argument 'AND', [self], required: false
           end
         end
 
@@ -52,6 +53,15 @@ module Graphiform
         end
       end
 
+      def graphql_grouping
+        local_demodulized_name = demodulized_name
+        Helpers.get_const_or_create(local_demodulized_name, ::Inputs::Groupings) do
+          Class.new(::Inputs::Groupings::BaseGrouping) do
+            graphql_name "#{local_demodulized_name}Grouping"
+          end
+        end
+      end
+
       def graphql_edge
         Helpers.get_const_or_create("#{demodulized_name}Edge", ::Types) do
           node_type = graphql_type
@@ -99,9 +109,10 @@ module Graphiform
                 @value
               end
 
-              def apply_built_ins(where: nil, sort: nil, **)
+              def apply_built_ins(where: nil, sort: nil, group: nil, **)
                 @value = @value.apply_filters(where.to_h) if where.present? && @value.respond_to?(:apply_filters)
                 @value = @value.apply_sorts(sort.to_h) if sort.present? && @value.respond_to?(:apply_sorts)
+                @value = @value.apply_groupings(group.to_h) if group.present? && @value.respond_to?(:apply_groupings)
 
                 @value
               end
@@ -115,6 +126,7 @@ module Graphiform
 
           local_graphql_filter = graphql_filter
           local_graphql_sort = graphql_sort
+          local_graphql_grouping = graphql_grouping
 
           model = self
           @base_resolver.class_eval do
@@ -126,6 +138,7 @@ module Graphiform
 
             argument :where, local_graphql_filter, required: false
             argument :sort, local_graphql_sort, required: false unless local_graphql_sort.arguments.empty?
+            argument :group, local_graphql_grouping, required: false unless local_graphql_grouping.arguments.empty?
           end
         end
 
@@ -141,7 +154,7 @@ module Graphiform
             def base_resolve(**args)
               @value = model.all
               apply_built_ins(**args)
-              @value.first
+              @value.take
             end
           end
         end

data/lib/graphiform/fields.rb

@@ -21,6 +21,7 @@ module Graphiform
 
         graphql_add_scopes_to_filter(name, as || name)
         graphql_field_to_sort(name, as || name)
+        graphql_field_to_grouping(name, as || name)
       end
 
       def graphql_writable_field(
@@ -120,9 +121,11 @@ module Graphiform
           type = association_def.klass.graphql_filter
         end
 
-        non_sort_by_scopes = added_scopes.select { |scope_def| !scope_def.options || scope_def.options[:type] != :sort }
+        filter_only_by_scopes = added_scopes.select do |scope_def|
+          !scope_def.options || scope_def.options[:type].blank? || scope_def.options[:type] == :enum
+        end
 
-        non_sort_by_scopes.each do |added_scope|
+        filter_only_by_scopes.each do |added_scope|
           scope_argument_type = type || added_scope.options[:argument_type]
           if added_scope.options[:type] == :enum
             enum = graphql_create_enum(name)
@@ -175,6 +178,28 @@ module Graphiform
         end
       end
 
+      def graphql_field_to_grouping(name, as)
+        column_def = column(as || name)
+        association_def = association(as || name)
+
+        type = GraphQL::Types::Boolean if column_def.present?
+        type = association_def.klass.graphql_grouping if Helpers.association_arguments_valid?(association_def, :graphql_grouping)
+
+        return if type.blank?
+
+        local_graphql_grouping = graphql_grouping
+
+        local_graphql_grouping.class_eval do
+          argument(
+            name,
+            type,
+            required: false,
+            as: as,
+            method_access: false
+          )
+        end
+      end
+
       def graphql_add_field_to_type(
         field_name,
         type,

data/lib/graphiform/helpers.rb

@@ -5,7 +5,7 @@ module Graphiform
     def self.logger
       return Rails.logger if Rails.logger.present?
 
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new($stdout)
       @logger
     end
 
@@ -32,6 +32,8 @@ module Graphiform
         GraphQL::Types::Float
       when :boolean
         GraphQL::Types::Boolean
+      when :json, :jsonb
+        GraphQL::Types::JSON
       else
         active_record_type
       end

data/lib/graphiform/skeleton.rb

@@ -45,6 +45,14 @@ module Graphiform
       Class.new(::GraphQL::Schema::InputObject)
     end
 
+    Helpers.get_const_or_create('Groupings', ::Inputs) do
+      Module.new
+    end
+
+    Helpers.get_const_or_create('BaseGrouping', ::Inputs::Groupings) do
+      Class.new(::GraphQL::Schema::InputObject)
+    end
+
     # Resolvers
     Helpers.get_const_or_create('Resolvers') do
       Module.new

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.2.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.11
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Generate GraphQL types, inputs, resolvers, queries, and connections based