graphql-groups 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30a036d32f2580c7dbbbd4ee10d8cc364e8dc4af0e92fc5d0ab1d3c8378f55e
-  data.tar.gz: fcd1bb1beeaed5247eba94cb72ac3418d3f29ca19a839ff78ed83e1b86aa602b
+  metadata.gz: bc6f31b4fca864cefe1967ddd17af2a65a782f53378f6b4c3bc5d7fb76a7819a
+  data.tar.gz: e64200c1a65480d32cdfb2826615e3ce8d26ae6fa61677e17a95a187c1b2063c
 SHA512:
-  metadata.gz: 8bbde25d65f689d6b2127761e1b535d1d1946bdedd569707498e4516d33d69da76b7efc9d34bb9bd41212b6822f195188c39556a88ad0d85a75e6eb34fbce93c
-  data.tar.gz: 43acc2931f89122b3e23f20e181cb8ab9e02d979bfd9153554d1f72b4a27a81a9ae722b975342e9ab37e5a930b2a2b777af97af8249ad74bfad293c93efbbf62
+  metadata.gz: 697fab7612389337ab019a3820cffbf91546ac5ddf026903448b6f5eb6815f0c468225aebe10d3febcee88dcfd174903fa487ae6f83361ed91ec605c43b0e94a
+  data.tar.gz: 4c99e4cbe13c9fa4e80a7a8c7b0958c2127675ba1e94f501b280160f8b231eda19f1ffaf9dcdfbcb0304d3721d66d416833696c8cf2074cf1092b15010766867

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql-groups (0.1.3)
+    graphql-groups (0.1.4)
       graphql (~> 1, > 1.9)
 
 GEM
@@ -36,8 +36,6 @@ GEM
       http (> 0.8, < 3.0)
       multi_json (~> 1)
     graphql (1.11.1)
-    groupdate (5.1.0)
-      activesupport (>= 5)
     gruff (0.10.0)
       histogram
       rmagick
@@ -91,15 +89,12 @@ GEM
       parser (>= 2.7.0.1)
     rubocop-rspec (1.42.0)
       rubocop (>= 0.87.0)
-    ruby-prof (1.4.1)
     ruby-progressbar (1.10.1)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)
     sqlite3 (1.4.2)
-    stackprof (0.2.15)
-    test-prof (0.12.0)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
@@ -119,17 +114,13 @@ DEPENDENCIES
   database_cleaner-active_record (~> 1.8)
   gqli (~> 1.0)
   graphql-groups!
-  groupdate
   gruff (~> 0.10)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.88)
   rubocop-rspec (~> 1.42)
-  ruby-prof
   simplecov (~> 0.18.5)
   sqlite3 (~> 1.4.2)
-  stackprof
-  test-prof
 
 BUNDLED WITH
    2.1.4

data/graphql-groups.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'graphql/groups/version'
@@ -11,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'Create flexible and fast aggregation queries with graphql-ruby'
   spec.description = <<~HEREDOC
     GraphQL Groups makes it easy to add aggregation queries to your GraphQL schema. It combines a simple, flexible 
-    schema definition with high performance'
+    schema definition with high performance
   HEREDOC
   spec.homepage = 'https://github.com/hschne/graphql-groups'
   spec.license = 'MIT'
@@ -22,8 +24,8 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|benchmark|.github)/}) }
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/graphql/groups/result_transformer.rb

@@ -68,13 +68,9 @@ module GraphQL
       end
 
       def merge(hashes)
-        root_key = hashes.first.keys.first
-        result = hashes.each_with_object({}) do |hash, object|
-          inner = hash[root_key]
-          inner_key = inner.keys.first
-          object[inner_key] = inner.values.first
+        hashes.each_with_object({}) do |hash, object|
+          object.deep_merge!(hash)
         end
-        { root_key => result }
       end
 
       def build_keys(key, keys)

data/lib/graphql/groups/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Graphql
   module Groups
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-groups
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Hans-Jörg Schnedlitz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -199,14 +199,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 description: "GraphQL Groups makes it easy to add aggregation queries to your GraphQL
-  schema. It combines a simple, flexible \nschema definition with high performance'\n"
+  schema. It combines a simple, flexible \nschema definition with high performance\n"
 email:
 - hans.schnedlitz@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -219,9 +218,6 @@ files:
 - Meister.png
 - README.md
 - Rakefile
-- benchmark/benchmark.jpg
-- benchmark/benchmark.rb
-- benchmark/benchmark_schema.rb
 - bin/console
 - bin/setup
 - graphql-groups.gemspec

data/.github/workflows/build.yml

@@ -1,28 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6.5
-      - name: Install dependencies
-        run: bundle install
-      - name: Run tests
-        run: bundle exec rspec
-      - name: Report coverage
-        uses: paambaati/codeclimate-action@v2.6.0
-        env:
-          CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
-        with:
-          # Coverage is already generated in test step, need to run anything again
-          coverageCommand: echo '' > /dev/null

data/benchmark/benchmark.rb

@@ -1,101 +0,0 @@
-# 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

@@ -1,53 +0,0 @@
-# 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