graphql-connections 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bf53a70dde489ced3c574a122728fd47122369a7e50ef8d45f5cf9c8743a09
-  data.tar.gz: 4f0b7158004251fced3b9989a0b0e1251e79f93208372b6c12aa60003816defd
+  metadata.gz: 4f48d965da430fdbc88992199c0fef0e92e0bfe6f75f900735abd80d96edc098
+  data.tar.gz: 3513296ea1afb7d5300c1c9737462bd5baf407f797cb45737e1fa97ccdc52bfb
 SHA512:
-  metadata.gz: 4d4e4beaa0f3124dfbfe6d99cfe1e911b38f24aee3fe6072aa69e38b9303042748f0ca18e4df973e67895901cf15978d5aabe4ad02396ae531cd1e1024df87d9
-  data.tar.gz: a981adbe63d036bf326a8ab6c0bd6a2fdf1b071f003f6665fab8302c48c9e69a1679353238c33d01f4a3469c3ae39363a2247b02bec703206ef4f30e457c8761
+  metadata.gz: 5f728d6e4fc47a7e0d7bb87cef013542e31370d33da2eb9289244dddb8a9dbd7ff80588726c437b1edc43fe569029c087a2016c76e62f80b30218f4b99a44060
+  data.tar.gz: 1f294f11f5f1e24bc525d1893ecd1de64ba39aae1bcbc9fd72487bfbd3d55b31983627de6c36c97d109b1f989b215fa312615750a31bea307de9d781aa5f2812

data/README.md

@@ -37,6 +37,28 @@ Records are sorted by model's primary key by default. You can change this behavi
 GraphQL::Connections::Stable.new(Message.all, primary_key: :created_at)
 ```
 
+In case when you want records to be sorted by more than one field (i.e., _keyset pagination_), you can use `keys` param:
+
+```ruby
+GraphQL::Connections::Stable.new(Message.all, keys: %w[name id])
+```
+
+When you pass only one key, a primary key will be added as a second one:
+
+```ruby
+GraphQL::Connections::Stable.new(Message.all, keys: [:name])
+```
+
+**NOTE:** Currently we support maximum two keys in the keyset.
+
+Also, you can pass the `:desc` option to reverse the relation:
+
+```ruby
+GraphQL::Connections::Stable.new(Message.all, keys: %w[name id], desc: true)
+```
+
+**NOTE:** `:desc` option is not implemented for stable connections with `:primary_key` passed; if you need it—use keyset pagination or implement `:desc` option for us 🙂.
+
 Also, you can disable opaque cursors by setting `opaque_cursor` param:
 
 ```ruby
@@ -53,7 +75,7 @@ class ApplicationSchema < GraphQL::Schema
 end
 ```
 
-**NOTE:** Don't use stable connections for relations whose ordering is too complicated for cursor generation. 
+**NOTE:** Don't use stable connections for relations whose ordering is too complicated for cursor generation.
 
 ## Development
 

data/lib/graphql/connections.rb

@@ -9,3 +9,10 @@ module GraphQL
 end
 
 require "graphql/connections/stable"
+
+require "graphql/connections/base"
+require "graphql/connections/key_asc"
+
+require "graphql/connections/keyset/base"
+require "graphql/connections/keyset/asc"
+require "graphql/connections/keyset/desc"

data/lib/graphql/connections/base.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Connections
+    # Base class for pagination implementations
+    class Base < ::GraphQL::Pagination::Connection
+      attr_reader :opaque_cursor
+
+      delegate :arel_table, to: :items
+
+      def initialize(*args, opaque_cursor: true, **kwargs)
+        @opaque_cursor = opaque_cursor
+
+        super(*args, **kwargs)
+      end
+
+      def primary_key
+        @primary_key ||= items.model.primary_key
+      end
+
+      def nodes
+        @nodes ||= limited_relation
+      end
+
+      def has_previous_page # rubocop:disable Naming/PredicateName
+        raise NotImplementedError
+      end
+
+      def has_next_page # rubocop:disable Naming/PredicateName
+        raise NotImplementedError
+      end
+
+      def cursor_for(item)
+        raise NotImplementedError
+      end
+
+      private
+
+      def serialize(cursor)
+        case cursor
+        when Time, DateTime, Date
+          cursor.iso8601
+        else
+          cursor.to_s
+        end
+      end
+
+      def limited_relation
+        raise NotImplementedError
+      end
+
+      def sliced_relation
+        raise NotImplementedError
+      end
+
+      def after_cursor
+        @after_cursor ||= opaque_cursor ? decode(after) : after
+      end
+
+      def before_cursor
+        @before_cursor ||= opaque_cursor ? decode(before) : before
+      end
+    end
+  end
+end

data/lib/graphql/connections/key_asc.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Connections
+    # Implements pagination by one field with asc order
+    class KeyAsc < ::GraphQL::Connections::Base
+      def initialize(*args, primary_key: nil, **kwargs)
+        @primary_key = primary_key
+
+        super(*args, **kwargs)
+      end
+
+      def has_previous_page # rubocop:disable Naming/PredicateName, Metrics/AbcSize
+        if last
+          nodes.any? && items.where(arel_table[primary_key].lt(nodes.first[primary_key])).exists?
+        elsif after
+          items.where(arel_table[primary_key].lteq(after_cursor)).exists?
+        else
+          false
+        end
+      end
+
+      def has_next_page # rubocop:disable Naming/PredicateName, Metrics/AbcSize
+        if first
+          nodes.any? && items.where(arel_table[primary_key].gt(nodes.last[primary_key])).exists?
+        elsif before
+          items.where(arel_table[primary_key].gteq(before_cursor)).exists?
+        else
+          false
+        end
+      end
+
+      def cursor_for(item)
+        cursor = serialize(item[primary_key])
+        cursor = encode(cursor) if opaque_cursor
+        cursor
+      end
+
+      private
+
+      def limited_relation # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        scope = sliced_relation
+        nodes = []
+
+        if first
+          nodes |= scope
+            .reorder(arel_table[primary_key].asc)
+            .limit(first)
+            .to_a
+        end
+
+        if last
+          nodes |= scope
+            .reorder(arel_table[primary_key].desc)
+            .limit(last)
+            .to_a.reverse!
+        end
+
+        nodes
+      end
+
+      def sliced_relation # rubocop:disable Metrics/AbcSize
+        items
+          .yield_self { |s| after ? s.where(arel_table[primary_key].gt(after_cursor)) : s }
+          .yield_self { |s| before ? s.where(arel_table[primary_key].lt(before_cursor)) : s }
+      end
+    end
+  end
+end

data/lib/graphql/connections/keyset/asc.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Connections
+    module Keyset
+      # Implements keyset pagination by two fields with asc order
+      class Asc < ::GraphQL::Connections::Keyset::Base
+        # rubocop:disable Naming/PredicateName, Metrics/AbcSize, Metrics/MethodLength
+        def has_previous_page
+          if last
+            nodes.any? &&
+              items.where(arel_table[field_key].eq(nodes.first[field_key]))
+                .where(arel_table[primary_key].lt(nodes.first[primary_key]))
+                .or(items.where(arel_table[field_key].lt(nodes.first[field_key])))
+                .exists?
+          elsif after
+            items
+              .where(arel_table[field_key].lt(after_cursor_date))
+              .or(
+                items.where(arel_table[field_key].eq(after_cursor_date))
+                  .where(arel_table[primary_key].lt(after_cursor_primary_key))
+              ).exists?
+          else
+            false
+          end
+        end
+
+        def has_next_page
+          if first
+            nodes.any? &&
+              items.where(arel_table[field_key].eq(nodes.last[field_key]))
+                .where(arel_table[primary_key].gt(nodes.last[primary_key]))
+                .or(items.where(arel_table[field_key].gt(nodes.last[field_key])))
+                .exists?
+          elsif before
+            items
+              .where(arel_table[field_key].gt(before_cursor_date))
+              .or(
+                items.where(arel_table[field_key].eq(before_cursor_date))
+                  .where(arel_table[primary_key].gt(before_cursor_primary_key))
+              ).exists?
+          else
+            false
+          end
+        end
+        # rubocop:enable Naming/PredicateName, Metrics/AbcSize, Metrics/MethodLength
+
+        private
+
+        def limited_relation # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          scope = sliced_relation
+          nodes = []
+
+          if first
+            nodes |= scope
+              .reorder(arel_table[field_key].asc, arel_table[primary_key].asc)
+              .limit(first).to_a
+          end
+
+          if last
+            nodes |= scope
+              .reorder(arel_table[field_key].desc, arel_table[primary_key].desc)
+              .limit(last).to_a.reverse!
+          end
+
+          nodes
+        end
+
+        def sliced_relation_after(relation) # rubocop:disable Metrics/AbcSize
+          relation
+            .where(arel_table[field_key].eq(after_cursor_date))
+            .where(arel_table[primary_key].gt(after_cursor_primary_key))
+            .or(relation.where(arel_table[field_key].gt(after_cursor_date)))
+        end
+
+        def sliced_relation_before(relation) # rubocop:disable Metrics/AbcSize
+          relation
+            .where(arel_table[field_key].eq(before_cursor_date))
+            .where(arel_table[primary_key].lt(before_cursor_primary_key))
+            .or(relation.where(arel_table[field_key].lt(before_cursor_date)))
+        end
+      end
+    end
+  end
+end

data/lib/graphql/connections/keyset/base.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Connections
+    module Keyset
+      # Base class for keyset pagination implementations
+      class Base < ::GraphQL::Connections::Base
+        attr_reader :field_key
+
+        SEPARATOR = "/"
+
+        def initialize(*args, keys:, separator: SEPARATOR, **kwargs)
+          @field_key, @primary_key = keys
+          @separator = separator
+
+          super(*args, **kwargs)
+        end
+
+        def cursor_for(item)
+          cursor = [item[field_key], item[primary_key]].map { |value| serialize(value) }.join(@separator)
+          cursor = encode(cursor) if opaque_cursor
+          cursor
+        end
+
+        private
+
+        def sliced_relation
+          items
+            .yield_self { |s| after ? sliced_relation_after(s) : s }
+            .yield_self { |s| before ? sliced_relation_before(s) : s }
+        end
+
+        def after_cursor_date
+          @after_cursor_date ||= after_cursor.first
+        end
+
+        def after_cursor_primary_key
+          @after_cursor_primary_key ||= after_cursor.last
+        end
+
+        def after_cursor
+          @after_cursor ||= super.split(SEPARATOR)
+        end
+
+        def before_cursor_date
+          @before_cursor_date ||= before_cursor.first
+        end
+
+        def before_cursor_primary_key
+          @before_cursor_primary_key ||= before_cursor.last
+        end
+
+        def before_cursor
+          @before_cursor ||= super.split(SEPARATOR)
+        end
+      end
+    end
+  end
+end

data/lib/graphql/connections/keyset/desc.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module Connections
+    module Keyset
+      # Implements keyset pagination by two fields with desc order
+      class Desc < ::GraphQL::Connections::Keyset::Base
+        # rubocop:disable Naming/PredicateName, Metrics/AbcSize, Metrics/MethodLength
+        def has_previous_page
+          if last
+            nodes.any? &&
+              items.where(arel_table[field_key].eq(nodes.first[field_key]))
+                .where(arel_table[primary_key].gt(nodes.first[primary_key]))
+                .or(items.where(arel_table[field_key].gt(nodes.first[field_key])))
+                .exists?
+          elsif after
+            items
+              .where(arel_table[field_key].gt(after_cursor_date))
+              .or(
+                items.where(arel_table[field_key].eq(after_cursor_date))
+                  .where(arel_table[primary_key].gt(after_cursor_primary_key))
+              ).exists?
+          else
+            false
+          end
+        end
+
+        def has_next_page
+          if first
+            nodes.any? &&
+              items.where(arel_table[field_key].eq(nodes.last[field_key]))
+                .where(arel_table[primary_key].lt(nodes.last[primary_key]))
+                .or(items.where(arel_table[field_key].lt(nodes.last[field_key])))
+                .exists?
+          elsif before
+            items
+              .where(arel_table[field_key].lt(before_cursor_date))
+              .or(
+                items.where(arel_table[field_key].eq(before_cursor_date))
+                  .where(arel_table[primary_key].lt(before_cursor_primary_key))
+              ).exists?
+          else
+            false
+          end
+        end
+        # rubocop:enable Naming/PredicateName, Metrics/AbcSize, Metrics/MethodLength
+
+        def cursor_for(item)
+          cursor = [item[field_key], item[primary_key]].map { |value| serialize(value) }.join(@separator)
+          cursor = encode(cursor) if opaque_cursor
+          cursor
+        end
+
+        private
+
+        def limited_relation # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          scope = sliced_relation
+          nodes = []
+
+          if first
+            nodes |= scope
+              .reorder(arel_table[field_key].desc, arel_table[primary_key].desc)
+              .limit(first).to_a
+          end
+
+          if last
+            nodes |= scope
+              .reorder(arel_table[field_key].asc, arel_table[primary_key].asc)
+              .limit(last)
+              .to_a.reverse!
+          end
+
+          nodes
+        end
+
+        def sliced_relation_after(relation) # rubocop:disable Metrics/AbcSize
+          relation
+            .where(arel_table[field_key].eq(after_cursor_date))
+            .where(arel_table[primary_key].lt(after_cursor_primary_key))
+            .or(relation.where(arel_table[field_key].lt(after_cursor_date)))
+        end
+
+        def sliced_relation_before(relation) # rubocop:disable Metrics/AbcSize
+          relation
+            .where(arel_table[field_key].eq(before_cursor_date))
+            .where(arel_table[primary_key].gt(before_cursor_primary_key))
+            .or(relation.where(arel_table[field_key].gt(before_cursor_date)))
+        end
+      end
+    end
+  end
+end

data/lib/graphql/connections/stable.rb

@@ -11,96 +11,18 @@ module GraphQL
     #
     # For more information see GraphQL Cursor Connections Specification
     # https://relay.dev/graphql/connections.htm
-    class Stable < ::GraphQL::Pagination::Connection
-      attr_reader :opaque_cursor
+    module Stable
+      def self.new(*args, desc: false, keys: nil, **kwargs)
+        if kwargs[:primary_key] || keys.nil?
+          raise NotImplementedError, "desc connection is not implemented yet" if desc
 
-      delegate :arel_table, to: :items
-
-      def initialize(*args, primary_key: nil, opaque_cursor: true, **kwargs)
-        @primary_key = primary_key
-        @opaque_cursor = opaque_cursor
-
-        super(*args, **kwargs)
-      end
-
-      def primary_key
-        @primary_key ||= items.model.primary_key
-      end
-
-      def nodes
-        @nodes ||= limited_relation
-      end
-
-      def has_previous_page # rubocop:disable Naming/PredicateName
-        if last
-          nodes.any? && items.where(arel_table[primary_key].lt(nodes.first[primary_key])).exists?
-        elsif after
-          items.where(arel_table[primary_key].lteq(after_cursor)).exists?
-        else
-          false
-        end
-      end
-
-      def has_next_page # rubocop:disable Naming/PredicateName
-        if first
-          nodes.any? && items.where(arel_table[primary_key].gt(nodes.last[primary_key])).exists?
-        elsif before
-          items.where(arel_table[primary_key].gteq(before_cursor)).exists?
-        else
-          false
-        end
-      end
-
-      def cursor_for(item)
-        cursor = serialize(item[primary_key])
-        cursor = encode(cursor) if opaque_cursor
-        cursor
-      end
-
-      private
-
-      def serialize(cursor)
-        case cursor
-        when Time, DateTime, Date
-          cursor.iso8601
-        else
-          cursor.to_s
-        end
-      end
-
-      def limited_relation
-        scope = sliced_relation
-        nodes = []
-
-        if first
-          nodes |= scope.
-                   reorder(arel_table[primary_key].asc).
-                   limit(first).
-                   to_a
+          return GraphQL::Connections::KeyAsc.new(*args, **kwargs)
         end
 
-        if last
-          nodes |= scope.
-                   reorder(arel_table[primary_key].desc).
-                   limit(last).
-                   to_a.reverse!
-        end
-
-        nodes
-      end
-
-      def sliced_relation
-        items.
-          yield_self { |s| after ? s.where(arel_table[primary_key].gt(after_cursor)) : s }.
-          yield_self { |s| before ? s.where(arel_table[primary_key].lt(before_cursor)) : s }
-      end
-
-      def after_cursor
-        @after_cursor ||= opaque_cursor ? decode(after) : after
-      end
+        raise ArgumentError, "keyset for more that 2 keys is not implemented yet" if keys.length > 2
 
-      def before_cursor
-        @before_cursor ||= opaque_cursor ? decode(before) : before
+        klass = desc ? GraphQL::Connections::Keyset::Desc : GraphQL::Connections::Keyset::Asc
+        klass.new(*args, **kwargs.merge(keys: keys))
       end
     end
   end

data/lib/graphql/connections/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Paging
-    VERSION = "0.2.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-connections
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Misha Merkushin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,43 +114,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: test-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-description: 
+        version: '1.0'
+description:
 email:
 - merkushin.m.s@gmail.com
 executables: []
@@ -160,6 +160,11 @@ files:
 - LICENSE.txt
 - README.md
 - lib/graphql/connections.rb
+- lib/graphql/connections/base.rb
+- lib/graphql/connections/key_asc.rb
+- lib/graphql/connections/keyset/asc.rb
+- lib/graphql/connections/keyset/base.rb
+- lib/graphql/connections/keyset/desc.rb
 - lib/graphql/connections/stable.rb
 - lib/graphql/connections/version.rb
 homepage: https://github.com/bibendi/graphql-connections
@@ -167,7 +172,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: GraphQL cursor-based stable pagination to work with Active Record relations
 test_files: []