graphiform 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1663df91a2cb043ecca554ce73964f977b6a5af2878334df72105177bddb04
-  data.tar.gz: f70a256ef76ce3ba4d91d25d2194bc1481d3c89e601a1b48a9f1ef6fe09bafd4
+  metadata.gz: 841f7ddfa6fd9f56cda166df64e77ec0d94fac684c872ce44b5fc024afe3d433
+  data.tar.gz: 10c339a1f949bf05dfa2dcf94a8bf3332f3a1c468699c605ab8ac60966644fd0
 SHA512:
-  metadata.gz: 2e77bbf7632faeb956acd2f7aa067428b7d2375f3c96b1ca71af95bd1d5ac12b5a8aa2d4229a9718c5dce7b566cd077f1018c84b5a251969a6a6579654cf07bb
-  data.tar.gz: 8ecfa9e57aa9b7692236114ff695aa5fad197a7c608127e93fca500b1a94a7ff7156cd093f1ac2a5d28438f93b86e4d1cdda4deb61186a5802212df216434d29
+  metadata.gz: e72009f747cf7bf8b6655940eb443900cf2c08e419cb25e1786aafc1b36347fb0f6916bc7d837a82681e46280a6bc5b6fe617b80ba081556f7acf319f01ed40b
+  data.tar.gz: d13b40bf891ccad27f83e7a23c55b20b5c94c594bc83d28ee07b762aca7a5740030aeaec20789d2cccc590ca701a566e0257555d5e0c2ee67fe02608e61c25ec

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/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.4'.freeze
+  VERSION = '0.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-03-24 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.2
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        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