graphiform 0.2.5 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f56c92956905df19b6e8a756b8826c63710619ab9c67f5e019280ccca4c0cd5
-  data.tar.gz: 6ac0fbb69feaa5d7a544dc1c5618f7c09b9cfd09fa6a0ad498e139e2c7539547
+  metadata.gz: 2e55c110ba5d43da683380c9539c51f93631a778035d365f6e2b46e17970e9da
+  data.tar.gz: 31a4e3a257380e80ccde4d64b82d1c25a2968103682e6007daad0ea4ab3aa74f
 SHA512:
-  metadata.gz: 8fe2ea6fc9d0c5bd906357d7571b2aa187c247a2fccd573716da623e22f784c3aaf4337fae660ec5b30061a40af57ac99f2cd1ec68b93c35cf06b8098196da3d
-  data.tar.gz: ee62442607c271725f12401d2d27f89667ef3992c41e7e09935809e5c2ee77c8aa99986d69a60ddacb7b0ab439717a47dd803a7579f3749514fca572fc440b15
+  metadata.gz: a2d85418970b93ad95ff1d8868a674365009d14e22158539c294e6ffeaa1cd9f4cb42026e4bfa672c8ddf97fd3a7ab980b1b6b3a33cbd134081eb2d4d1d79aea
+  data.tar.gz: 1a3314cb91a7bbffcb3060820e7cd9501b82aca0f168e6de51aca60df6e31e9635ada501361a319ba56327c0b8abe2150e81f1f52e9dda7800bda6708846b0cd

data/lib/graphiform.rb

@@ -5,6 +5,7 @@ require 'graphiform/skeleton'
 require 'graphiform/active_record_helpers'
 require 'graphiform/core'
 require 'graphiform/fields'
+require 'graphiform/sort_enum'
 
 module Graphiform
   def self.included(base)

data/lib/graphiform/core.rb

@@ -52,6 +52,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 +108,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 +125,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 +137,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
 

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)
@@ -157,7 +160,7 @@ module Graphiform
         column_def = column(as || name)
         association_def = association(as || name)
 
-        type = ::Enums::Sort if column_def.present?
+        type = ::Graphiform::SortEnum if column_def.present?
         type = association_def.klass.graphql_sort if Helpers.association_arguments_valid?(association_def, :graphql_sort)
 
         return if type.blank?
@@ -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

@@ -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
@@ -80,12 +88,5 @@ module Graphiform
     Helpers.get_const_or_create('BaseEnum', ::Enums) do
       Class.new(::GraphQL::Schema::Enum)
     end
-
-    Helpers.get_const_or_create('Sort', ::Enums) do
-      Class.new(::Enums::BaseEnum) do
-        value 'ASC', 'Sort results in ascending order'
-        value 'DESC', 'Sort results in descending order'
-      end
-    end
   end
 end

data/lib/graphiform/sort_enum.rb

@@ -0,0 +1,8 @@
+require 'graphql'
+
+module Graphiform
+  class SortEnum < ::GraphQL::Schema::Enum
+    value 'ASC', 'Sort results in ascending order'
+    value 'DESC', 'Sort results in descending order'
+  end
+end

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.10
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2021-05-06 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
@@ -124,6 +124,7 @@ files:
 - lib/graphiform/fields.rb
 - lib/graphiform/helpers.rb
 - lib/graphiform/skeleton.rb
+- lib/graphiform/sort_enum.rb
 - lib/graphiform/version.rb
 - lib/tasks/graphiform_tasks.rake
 homepage: https://github.com/3-form/graphiform
@@ -145,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