graphql-groups 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335a39d1b463c58fea371465f9f5bc97034b6e698b4345acb106e107be5339a5
-  data.tar.gz: 8a605ac9caf825e1a45c1dd385a7de295d98876b8147ddeed63d0eaad6c56ef4
+  metadata.gz: 46969188f84ff7921fee98bfad6f6264125bcce523dfcb7c93550eb1755a3951
+  data.tar.gz: f6a925a6c8037b42a134fca19d5d0d631656bdd3ec3a8a963fcfe95dbfbf16e9
 SHA512:
-  metadata.gz: 884ec7cb95a187e714920bfd214cbde487fb1aa1787fad8595f16a2294df68ba705074630ebfc54169bb99e4e8a09f0dc30e9e6d68530413d5fa45af6a6dd718
-  data.tar.gz: 719ea4cbd49fff5274b2e90cd4f3b7e041d50a8026139b32092d97f39b448b63d30a94208ad76e6ce17a258ca4de64641fb5fc5cff4677fe021a18f12b15da47
+  metadata.gz: 450065ae2c4f015adc736241d1a917cdc65ceaa122305db706f6b138263cbbdf32c1636b7ad2017d058ff4c2276c970a4896e471015badbabbc5ee72aca3be01
+  data.tar.gz: 81da40cf05c3b6b284858037baee1b9402ef38eaeb4559315784e4fbfd2f6d8a5f7897dabbf981f4a5fd220d5ee66fb06dc89fd8e785202951ca0edb22d69f3b

data/.gitignore

@@ -162,5 +162,5 @@ tags
 
 .tool-versions
 .rspec_status
-test.db
+test.db*
 coverage

data/.rubocop.yml

@@ -7,11 +7,12 @@ Metrics/BlockLength:
   ExcludedMethods: ['describe', 'context']
 
 Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
+  EnforcedStyle: indented_relative_to_receiver
 
 Style/BlockDelimiters:
   Exclude:
     - spec/**/*
+    - benchmark/**/*
 
 RSpec/ExampleLength:
   Exclude:

data/Gemfile.lock

@@ -7,27 +7,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    arel (9.0.0)
     ast (2.4.1)
+    benchmark-ips (2.8.2)
     concurrent-ruby (1.1.6)
     database_cleaner (1.8.5)
     database_cleaner-active_record (1.8.0)
       activerecord
       database_cleaner (~> 1.8.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -35,8 +35,12 @@ GEM
       hashie (~> 3.0)
       http (> 0.8, < 3.0)
       multi_json (~> 1)
-    graphql (1.10.10)
+    graphql (1.11.1)
+    gruff (0.10.0)
+      histogram
+      rmagick
     hashie (3.6.0)
+    histogram (0.2.4.1)
     http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -46,11 +50,10 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    minitest (5.14.0)
-    multi_json (1.14.1)
+    minitest (5.14.1)
+    multi_json (1.15.0)
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
@@ -59,6 +62,7 @@ GEM
     rake (13.0.1)
     regexp_parser (1.7.1)
     rexml (3.2.4)
+    rmagick (4.1.2)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -86,11 +90,10 @@ GEM
     rubocop-rspec (1.42.0)
       rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
-    simplecov (0.16.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     sqlite3 (1.4.2)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
@@ -99,21 +102,24 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.0)
+  activerecord (~> 6.0)
+  benchmark-ips (~> 2.8)
   bundler (~> 2.0)
-  database_cleaner-active_record
-  gqli
+  database_cleaner-active_record (~> 1.8)
+  gqli (~> 1.0)
   graphql-groups!
+  gruff (~> 0.10)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.88)
   rubocop-rspec (~> 1.42)
-  simplecov
+  simplecov (~> 0.18.5)
   sqlite3 (~> 1.4.2)
 
 BUNDLED WITH

data/README.md

@@ -1,14 +1,15 @@
 # GraphQL Groups
 
+[![Gem Version](https://badge.fury.io/rb/graphql-groups.svg)](https://badge.fury.io/rb/graphql-groups)
 [![Build Status](https://github.com/hschne/graphql-groups/workflows/Build/badge.svg)](https://github.com/hschne/graphql-groups/workflows/Build/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/692d4125ac8548fb145e/maintainability)](https://codeclimate.com/github/hschne/graphql-groups/maintainability) 
 [![Test Coverage](https://api.codeclimate.com/v1/badges/692d4125ac8548fb145e/test_coverage)](https://codeclimate.com/github/hschne/graphql-groups/test_coverage)
 
-Create flexible and performant aggregation queries with [graphql-ruby](https://github.com/rmosolgo/graphql-ruby)
+Statistics and aggregates built on top of [graphql-ruby](https://github.com/rmosolgo/graphql-ruby).
 
 ## Installation
 
-Add this line to your application's Gemfile and execute bundler.
+Add this line to your application's Gemfile and run `bundle install`.
 
 ```ruby
 gem 'graphql-groups'
@@ -19,27 +20,28 @@ $ bundle install
 
 ## Usage
 
-Create a new group type to specify which attributes you wish to group by inheriting from `GraphQL::Groups::GroupType`
+Create a new group type to specify which attributes you wish to group by inheriting from `GraphQL::Groups::GroupType`:
 
 ```ruby
 class AuthorGroupType < GraphQL::Groups::GroupType
   scope { Author.all }
 
+  by :name
   by :age
 end
 ```
 
-Include the new type in your schema using the `group` keyword. 
+Include the new type in your schema using the `group` keyword, and you are done.
 
 ```ruby
-class QueryType < BaseType
+class QueryType < GraphQL::Schema::Object
   include GraphQL::Groups
 
   group :author_groups, AuthorGroupType
 end
 ```
 
-You can then run an aggregation query for this grouping. 
+You can then run a query to retrieve statistical information about your data, for example the number of authors per age.
 
 ```graphql
 query myQuery{ 
@@ -67,14 +69,74 @@ query myQuery{
     ]
   }
 }
-
 ```
 
+## Why? 
+
+`graphql-ruby` lacks a built in way to query statistical data of collections. It is possible to add this functionality by
+using `group_by` (see for example [here](https://dev.to/gopeter/how-to-add-a-groupby-field-to-your-graphql-api-1f2j)), 
+but this performs poorly for large amounts of data. 
+
+`graphql-groups` allows you to write flexible, readable queries while leveraging your database to group and
+aggregate data. See [performance](#Performance) for a benchmark.
+
 ## Advanced Usage
 
+#### Grouping by Multiple Attributes
+
+This library really shines when you want to group by multiple attributes, or otherwise retrieve complex statistical information
+within a single GraphQL query. 
+
+For example, to get the number of authors grouped by their name, and then also by age, you could construct a query similar to this: 
+
+```graphql
+query myQuery{ 
+  authorGroups {
+    name {
+      key
+      count
+      groupBy {
+       age {
+        key
+        count
+       }
+      }
+    }
+ }
+}
+``` 
+
+```json
+{
+  "authorGroups":{
+    "name":[
+      {
+        "key":"Ada",
+        "count":2,
+        "groupBy":  {
+          "age": [
+            {
+            "key":"30",
+            "count":1
+            },
+            {
+            "key":"35",
+            "count":1
+            }
+          ]     
+        }
+      },
+      ...
+    ]
+  }
+}
+```
+
+`graphql-groups` will automatically execute the required queries and return the results in a easily parsable response.
+
 #### Custom Grouping Queries
 
-To customize how items are grouped, you may specify the grouping query by creating a method of the same name in the group type. 
+To customize which queries are executed to group items, you may specify the grouping query by creating a method of the same name in the group type.
 
 ```ruby
 class AuthorGroupType < GraphQL::Groups::Schema::GroupType
@@ -111,7 +173,32 @@ class BookGroupType < GraphQL::Groups::Schema::GroupType
 end
 ```
 
-For more examples see the [feature spec](./spec/graphql/feature_spec.rb) and [test schema](./spec/graphql/support/test_schema)
+When defining a group type's scope you may access the parents `object` and `context`. 
+
+```ruby
+class QueryType < GraphQL::Schema::Object
+  field :statistics, StatisticsType, null: false
+
+  def statistics
+    Book.all
+  end
+end
+
+class StatisticsType < GraphQL::Schema::Object
+  include GraphQL::Groups
+
+  group :books, BookGroupType
+end
+
+class BookGroupType < GraphQL::Groups::Schema::GroupType
+  # `object` refers to `Book.all`
+  scope { object.where(author_id: context[:current_person]) }
+
+  by :name
+end
+```
+
+For more examples see the [feature spec](./spec/graphql/feature_spec.rb) and [test schema](./spec/graphql/support/test_schema.rb)
 
 ### Custom Aggregates
 
@@ -158,10 +245,26 @@ end
 
 For more examples see the [feature spec](./spec/graphql/feature_spec.rb) and [test schema](./spec/graphql/support/test_schema)
 
+## Performance
+
+While it is possible to add grouping to your GraphQL schema by using `group_by` (see [above](#why)) this performs poorly for large amounts of data. The graph below shows the number of requests per second possible with both implementations.
+
+![benchmark](benchmark/benchmark.jpg)
+
+The benchmark queries the author count grouped by name, using an increasing number of authors. While the in-memory approach of grouping works well for a small number of records, it is outperformed quickly as that number increases.
+
+Benchmarks are generated using [benchmark-ips](https://github.com/evanphx/benchmark-ips). The benchmark script used to generate the report be found [here](./benchmark/benchmark.rb)
+
 ## Limitations and Known Issues
 
-*This gem is in early development!*. There are a number of issues that are still being addressed. There is no guarantee
-that this libraries API will not change fundamentally from one release to the next.
+*This gem is in early development!* There are a number of issues that are still being addressed. There is no guarantee
+that this libraries API will not change fundamentally from one release to the next. Please refer to the [issue tracker](https://github.com/hschne/graphql-groups/issues) for a list of known issues.
+
+## Credits
+
+![Meister](meister.png)
+
+graphql-groups is supported by and battle-tested at [Meister](https://www.meisterlabs.com/)
 
 ## Development
 
@@ -171,7 +274,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/graphql-groups. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/hschne/graphql-groups. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/Rakefile

@@ -1,6 +1,13 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
+
+desc 'Show benchmark results'
+task :benchmark do
+  require_relative 'benchmark/benchmark'
+
+  Compare.new.run
+end

data/benchmark/benchmark.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require 'graphql/groups'
+
+require 'database_cleaner/active_record'
+require 'gqli/dsl'
+require 'benchmark/ips'
+require 'gruff'
+
+require_relative '../spec/graphql/support/test_schema/db'
+require_relative '../spec/graphql/support/test_schema/models'
+require_relative 'benchmark_schema'
+
+class Compare
+  def run
+    puts 'Generating reports...'
+    datasets = perform_runs
+    labels = { 0 => '10', 1 => '100', 2 => '1000', 3 => '10000' }
+    puts 'Generating graph...'
+    graph = graph(labels, datasets)
+    graph.write('benchmark/benchmark.jpg')
+    puts 'Done!'
+  end
+
+  private
+
+  def perform_runs
+    runs = [10, 100, 1000, 10_000]
+    runs.map { |count| single_run(count) }
+      .map(&:data)
+      .map { |data| { groups: data.first[:ips], group_by: data.second[:ips] } }
+      .each_with_object({ groups: [], group_by: [] }) do |item, object|
+      object[:groups].push(item[:groups])
+      object[:group_by].push(item[:group_by])
+    end
+  end
+
+  def graph(labels, datasets)
+    g = Gruff::Bar.new(800)
+    g.title = 'graphql-groups vs group_by'
+    g.theme = Gruff::Themes::THIRTYSEVEN_SIGNALS
+    g.labels = labels
+    g.x_axis_label = 'records'
+    g.y_axis_label = 'iterations/second'
+    datasets.each do |data|
+      g.data(data[0], data[1])
+    end
+    g
+  end
+
+  def single_run(count)
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.start
+    seed(count)
+    report = run_benchmark
+    DatabaseCleaner.clean
+    report
+  end
+
+  def seed(count)
+    names = %w[Ada Alice Bob Bruce]
+    count.times { Author.create(name: names.sample) }
+  end
+
+  def groups_query
+    GQLi::DSL.query {
+      fastGroups {
+        name {
+          key
+          count
+        }
+      }
+    }.to_gql
+  end
+
+  def naive_query
+    GQLi::DSL.query {
+      slowGroups {
+        name {
+          key
+          count
+        }
+      }
+    }.to_gql
+  end
+
+  def run_benchmark
+    Benchmark.ips(quiet: true) do |x|
+      # Configure the number of seconds used during
+      # the warmup phase (default 2) and calculation phase (default 5)
+      x.config(time: 2, warmup: 1)
+
+      x.report('groups') { PerformanceSchema.execute(groups_query) }
+
+      x.report('group-by') { PerformanceSchema.execute(naive_query) }
+
+      # Compare the iterations per second of the various reports!
+      x.compare!
+    end
+  end
+end

data/benchmark/benchmark_schema.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'graphql'
+require 'graphql/groups'
+
+class BaseType < GraphQL::Schema::Object; end
+
+class AuthorGroupType < GraphQL::Groups::Schema::GroupType
+  scope { Author.all }
+
+  by :name
+end
+
+class SlowAuthorGroupResultType < GraphQL::Schema::Object
+  field :key, String, null: false
+  field :count, Integer, null: false
+
+  def key
+    object[0]
+  end
+
+  def count
+    object[1].size
+  end
+end
+
+class SlowAuthorGroupType < GraphQL::Schema::Object
+  field :name, [SlowAuthorGroupResultType], null: false
+
+  def name
+    object.group_by(&:name)
+  end
+end
+
+class QueryType < BaseType
+  include GraphQL::Groups
+
+  group :fast_groups, AuthorGroupType, camelize: true
+
+  field :slow_groups, SlowAuthorGroupType, null: false, camelize: true
+
+  def slow_groups
+    Author.all
+  end
+end
+
+class PerformanceSchema < GraphQL::Schema
+  query QueryType
+
+  def self.resolve_type(_type, obj, _ctx)
+    "#{obj.class.name}Type"
+  end
+end

data/graphql-groups.gemspec

@@ -29,15 +29,17 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'activerecord', '~> 5.0'
+  spec.add_development_dependency 'activerecord', '~> 6.0'
+  spec.add_development_dependency 'benchmark-ips', '~> 2.8'
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'database_cleaner-active_record'
-  spec.add_development_dependency 'gqli'
+  spec.add_development_dependency 'database_cleaner-active_record', '~> 1.8'
+  spec.add_development_dependency 'gqli', '~> 1.0'
+  spec.add_development_dependency 'gruff', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.88'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.42'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.18.5'
   spec.add_development_dependency 'sqlite3', '~> 1.4.2'
 
   spec.add_dependency 'graphql', '~> 1', '> 1.9'

data/lib/graphql/groups.rb

@@ -3,8 +3,8 @@
 require 'graphql/groups/version'
 
 require 'graphql'
-require 'graphql/groups/extensions/wrap'
 
+require 'graphql/groups/group_type_registry'
 require 'graphql/groups/schema/group_field'
 require 'graphql/groups/schema/aggregate_field'
 require 'graphql/groups/schema/aggregate_type'
@@ -28,15 +28,11 @@ module GraphQL
 
     module ClassMethods
       def group(name, type, **options)
-        # TODO: Suppress/warn if options are used that cannot be used
         field name, type, extras: [:lookahead], null: false, **options
 
         define_method name do |lookahead: nil|
           execution_plan = GraphQL::Groups::LookaheadParser.parse(lookahead)
-          base_query = nil
-          type.instance_eval do
-            base_query = instance_eval(&@own_scope)
-          end
+          base_query = type.authorized_new(object, context).scope
           results = Executor.call(base_query, execution_plan)
           GraphQL::Groups::ResultTransformer.new.run(results)
         end

data/lib/graphql/groups/executor.rb

@@ -24,7 +24,8 @@ module GraphQL
             end
           end
 
-          return { key => results } unless value[:nested]
+          results = { key => results }
+          return results unless value[:nested]
 
           value[:nested].each do |inner_key, inner_value|
             new_key = (Array.wrap(key) << inner_key)

data/lib/graphql/groups/group_type_registry.rb

@@ -0,0 +1,23 @@
+require 'singleton'
+
+module GraphQL
+  module Groups
+    class GroupTypeRegistry
+      include Singleton
+
+      attr_reader :types
+
+      def initialize
+        @types = {}
+      end
+
+      def register(type, derived)
+        types[type] = derived
+      end
+
+      def get(type)
+        types[type]
+      end
+    end
+  end
+end

data/lib/graphql/groups/has_groups.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GraphQL
   module Groups
     module HasGroups
@@ -6,7 +7,16 @@ module GraphQL
         base.extend(ClassMethods)
       end
 
+      attr_reader :scope
+
+      def initialize(object, context)
+        super(object, context)
+        @scope = instance_eval(&self.class.class_scope)
+      end
+
       module ClassMethods
+        attr_reader :class_scope
+
         # TODO: Error if there are no groupings defined
         def by(name, **options, &block)
           query_method = options[:query_method] || name
@@ -21,6 +31,7 @@ module GraphQL
             kwargs[:scope].group(name)
           end
 
+          # TODO: Warn / Disallow overwriting these resolver methods
           define_method resolver_method do |**_|
             group[name]
           end
@@ -37,31 +48,34 @@ module GraphQL
         end
 
         def scope(&block)
-          @own_scope = block
+          @class_scope = block
         end
 
         private
 
         def own_result_type
-          name = "#{self.name.gsub(/Type$/, '')}ResultType"
-
-          type = name.safe_constantize || GraphQL::Groups::Schema::GroupResultType
+          type = find_result_type
           own_group_type = self
 
-          @classes ||= {}
-          @classes[type] ||= Class.new(type) do
-            graphql_name name
+          registry = GraphQL::Groups::GroupTypeRegistry.instance
+          # To avoid name conflicts check if a result type has already been registered, and if not create a new one
+          registry.get(type) || registry.register(type, Class.new(type) do
+            graphql_name type.name.demodulize
 
             field :group_by, own_group_type, null: false, camelize: true
 
             def group_by
               group_result[1][:nested]
             end
-          end
+          end)
         end
 
-        def own_scope
-          @own_scope ||= nil
+        def find_result_type
+          return @own_result_type if @own_result_type
+
+          return GraphQL::Groups::Schema::GroupResultType unless name
+
+          "#{name.gsub(/Type$/, '')}ResultType".safe_constantize || GraphQL::Groups::Schema::GroupResultType
         end
       end
     end

data/lib/graphql/groups/result_transformer.rb

@@ -24,24 +24,23 @@ module GraphQL
       end
 
       def transform_result(key, result)
-        result.each_with_object({}) do |(aggregate_key, value), object|
-          if value.values.any? { |x| x.is_a?(Hash) }
-            value.each { |attribute, value| object.deep_merge!(transform_attribute(key, aggregate_key, attribute, value)) }
+        transformed = result.each_with_object({}) do |(aggregate_key, aggregate_value), object|
+          if aggregate_value.values.any? { |x| x.is_a?(Hash) }
+            aggregate_value.each do |attribute, value|
+              object.deep_merge!(transform_attribute(key, aggregate_key, attribute, value))
+            end
           else
-            object.deep_merge!(transform_aggregate(key, aggregate_key, value))
+            object.deep_merge!(transform_aggregate(key, aggregate_key, aggregate_value))
           end
         end
+
+        transformed.presence || { key => [] }
       end
 
       # TODO: Merge transform aggregate and transform attribute
       def transform_aggregate(key, aggregate, result)
         result.each_with_object({}) do |(keys, value), object|
-          key = Array.wrap(key)
-          keys = keys ? Array.wrap(keys).map { |x| x || 'null' } : ['null']
-          nested = [:nested] * (key.length - 1)
-
-          # See https://stackoverflow.com/a/5095149/2553104
-          with_zipped = key.zip(keys).zip(nested).flatten!.compact
+          with_zipped = build_keys(key, keys)
           with_zipped.append(aggregate)
           hash = with_zipped.reverse.inject(value) { |a, n| { n => a } }
           object.deep_merge!(hash)
@@ -50,17 +49,32 @@ module GraphQL
 
       def transform_attribute(key, aggregate, attribute, result)
         result.each_with_object({}) do |(keys, value), object|
-          key = Array.wrap(key)
-          keys = keys ? Array.wrap(keys).map { |x| x || 'null' } : ['null']
-          nested = [:nested] * (key.length - 1)
-
-          with_zipped = key.zip(keys).zip(nested).flatten!.compact
+          with_zipped = build_keys(key, keys)
           with_zipped.append(aggregate)
           with_zipped.append(attribute)
           hash = with_zipped.reverse.inject(value) { |a, n| { n => a } }
           object.deep_merge!(hash)
         end
       end
+
+      def build_keys(key, keys)
+        key = wrap(key)
+        keys = keys ? wrap(keys) : [nil]
+        nested = [:nested] * (key.length - 1)
+
+        with_zipped = key.zip(keys).zip(nested).flatten!
+        with_zipped.first(with_zipped.size - 1)
+      end
+
+      def wrap(object)
+        if object.nil?
+          []
+        elsif object.respond_to?(:to_ary)
+          object.to_ary || [object]
+        else
+          [object]
+        end
+      end
     end
   end
 end

data/lib/graphql/groups/schema/group_field.rb

@@ -7,6 +7,7 @@ module GraphQL
         attr_reader :query_method
 
         def initialize(query_method:, **options, &definition_block)
+          # TODO: Make sure that users can access the context in custom query methods
           @query_method = query_method
           super(**options, &definition_block)
         end

data/lib/graphql/groups/schema/group_result_type.rb

@@ -11,7 +11,7 @@ module GraphQL
 
         alias group_result object
 
-        field :key, String, null: false
+        field :key, String, null: true
 
         field :count, Integer, null: false
 

data/lib/graphql/groups/schema/group_type.rb

@@ -10,10 +10,7 @@ module GraphQL
 
         alias group object
 
-        def initialize(object, context)
-          super(object, context)
-        end
-
+        # TODO: Make group field inherit from default field, so that users default args/fields are respected
         field_class(GroupField)
       end
     end

data/lib/graphql/groups/version.rb

@@ -1,5 +1,5 @@
 module Graphql
   module Groups
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-groups
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hans-Jörg Schnedlitz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +56,44 @@ dependencies:
   name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: gqli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: gruff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +154,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +216,18 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- Meister.png
 - README.md
 - Rakefile
+- benchmark/benchmark.jpg
+- benchmark/benchmark.rb
+- benchmark/benchmark_schema.rb
 - bin/console
 - bin/setup
 - graphql-groups.gemspec
 - lib/graphql/groups.rb
 - lib/graphql/groups/executor.rb
-- lib/graphql/groups/extensions/wrap.rb
+- lib/graphql/groups/group_type_registry.rb
 - lib/graphql/groups/has_aggregates.rb
 - lib/graphql/groups/has_groups.rb
 - lib/graphql/groups/lookahead_parser.rb

data/lib/graphql/groups/extensions/wrap.rb

@@ -1,11 +0,0 @@
-class Array
-  def self.wrap(object)
-    if object.nil?
-      []
-    elsif object.respond_to?(:to_ary)
-      object.to_ary || [object]
-    else
-      [object]
-    end
-  end
-end