graphiti 1.2.42 → 1.3.9

data/lib/graphiti/scoping/paginate.rb

@@ -1,6 +1,7 @@
 module Graphiti
   class Scoping::Paginate < Scoping::Base
     DEFAULT_PAGE_SIZE = 20
+    PARAMS = [:number, :size, :offset, :before, :after]
 
     def apply
       if size > resource.max_page_size
@@ -33,24 +34,67 @@ module Graphiti
 
     # Apply default pagination proc via the Resource adapter
     def apply_standard_scope
-      resource.adapter.paginate(@scope, number, size)
+      meth = resource.adapter.method(:paginate)
+
+      if meth.arity == 4 # backwards-compat
+        resource.adapter.paginate(@scope, number, size, offset)
+      else
+        resource.adapter.paginate(@scope, number, size)
+      end
     end
 
     # Apply the custom pagination proc
     def apply_custom_scope
-      resource.instance_exec(@scope, number, size, resource.context, &custom_scope)
+      resource.instance_exec \
+        @scope,
+        number,
+        size,
+        resource.context,
+        offset,
+        &custom_scope
     end
 
     private
 
     def requested?
-      ![page_param[:size], page_param[:number]].all?(&:nil?)
+      !PARAMS.map { |p| page_param[p] }.all?(&:nil?)
     end
 
     def page_param
       @page_param ||= (query_hash[:page] || {})
     end
 
+    def offset
+      offset = nil
+
+      if (value = page_param[:offset])
+        offset = value.to_i
+      end
+
+      if before_cursor&.key?(:offset)
+        if page_param.key?(:number)
+          raise Errors::UnsupportedBeforeCursor
+        end
+
+        offset = before_cursor[:offset] - (size * number) - 1
+        offset = 0 if offset.negative?
+      end
+
+      if after_cursor&.key?(:offset)
+        offset = after_cursor[:offset]
+      end
+
+      offset
+    end
+
+    def after_cursor
+      page_param[:after]
+    end
+
+    def before_cursor
+      page_param[:before]
+    end
+
     def number
       (page_param[:number] || 1).to_i
     end

data/lib/graphiti/scoping/sort.rb

@@ -59,12 +59,10 @@ module Graphiti
     end
 
     def sort_param
-      @sort_param ||= begin
-        if query_hash[:sort].blank?
-          resource.default_sort || []
-        else
-          normalize(query_hash[:sort])
-        end
+      @sort_param ||= if query_hash[:sort].blank?
+        resource.default_sort || []
+      else
+        normalize(query_hash[:sort])
       end
     end
 

data/lib/graphiti/serializer.rb

@@ -25,8 +25,9 @@ module Graphiti
 
         # See #requested_relationships
         def self.relationship(name, options = {}, &block)
+          prev = Util::Hash.deep_dup(field_condition_blocks)
           super
-          field_condition_blocks.delete(name)
+          self.field_condition_blocks = prev
           _register_condition(relationship_condition_blocks, name, options)
         end
 
@@ -45,6 +46,23 @@ module Graphiti
       end
     end
 
+    def cursor
+      starting_offset = 0
+      page_param = @proxy.query.pagination
+      if (page_number = page_param[:number])
+        page_size = page_param[:size] || @resource.default_page_size
+        starting_offset = (page_number - 1) * page_size
+      end
+
+      if (cursor = page_param[:after])
+        starting_offset = cursor[:offset]
+      end
+
+      current_offset = @object.instance_variable_get(:@__graphiti_index)
+      offset = starting_offset + current_offset + 1 # (+ 1 b/c o-base index)
+      Base64.encode64({offset: offset}.to_json).chomp
+    end
+
     def as_jsonapi(kwargs = {})
       super(**kwargs).tap do |hash|
         strip_relationships!(hash) if strip_relationships?

data/lib/graphiti/sideload/polymorphic_belongs_to.rb

@@ -7,7 +7,6 @@ class Graphiti::Sideload::PolymorphicBelongsTo < Graphiti::Sideload::BelongsTo
       @calls = []
     end
 
-    # rubocop: disable Style/MethodMissingSuper
     def method_missing(name, *args, &blk)
       @calls << [name, args, blk]
     end
@@ -56,9 +55,9 @@ class Graphiti::Sideload::PolymorphicBelongsTo < Graphiti::Sideload::BelongsTo
           args = call[1]
           opts = args.extract_options!
           opts.merge! as: sideload.name,
-                      parent: sideload,
-                      group_name: group.name,
-                      polymorphic_child: true
+            parent: sideload,
+            group_name: group.name,
+            polymorphic_child: true
           unless sideload.resource.class.abstract_class?
             opts[:foreign_key] ||= sideload.foreign_key
             opts[:primary_key] ||= sideload.primary_key

data/lib/graphiti/stats/dsl.rb

@@ -46,7 +46,6 @@ module Graphiti
       #
       # ...will hit +method_missing+ and store the proc for future reference.
       # @api private
-      # rubocop: disable Style/MethodMissingSuper
       def method_missing(meth, *args, &blk)
         @calculations[meth] = blk
       end

data/lib/graphiti/util/serializer_attributes.rb

@@ -28,6 +28,12 @@ module Graphiti
 
         existing = @serializer.send(applied_method)
         @serializer.send(:"#{applied_method}=", [@name] | existing)
+
+        @serializer.meta do
+          if !!@resource.try(:cursor_paginatable?) && !Graphiti.context[:graphql]
+            {cursor: cursor}
+          end
+        end
       end
 
       private

data/lib/graphiti/util/simple_errors.rb

@@ -33,7 +33,7 @@ module Graphiti
       def size
         values.flatten.size
       end
-      alias count size
+      alias_method :count, :size
 
       def values
         messages.values.reject(&:empty?)
@@ -48,7 +48,7 @@ module Graphiti
       def empty?
         size.zero?
       end
-      alias blank? empty?
+      alias_method :blank?, :empty?
 
       def add(attribute, code, message: nil)
         message ||= "is #{code.to_s.humanize.downcase}"
@@ -64,7 +64,7 @@ module Graphiti
       def full_messages
         map { |attribute, message| full_message(attribute, message) }
       end
-      alias to_a full_messages
+      alias_method :to_a, :full_messages
 
       def full_messages_for(attribute)
         attribute = attribute.to_sym

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.42"
+  VERSION = "1.3.9"
 end

data/lib/graphiti.rb

@@ -208,6 +208,7 @@ module InstanceVariableOverride
     values
   end
 end
+
 class Object
   prepend InstanceVariableOverride
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.42
+  version: 1.3.9
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -152,44 +152,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: graphiti_spec_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -212,10 +212,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".standard.yml"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
@@ -246,15 +246,12 @@ files:
 - deprecated_generators/graphiti/templates/update_request_spec.rb.erb
 - exe/graphiti
 - gemfiles/.bundle/config
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_0_graphiti_rails.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_1_graphiti_rails.gemfile
 - gemfiles/rails_5_2.gemfile
 - gemfiles/rails_5_2_graphiti_rails.gemfile
 - gemfiles/rails_6.gemfile
 - gemfiles/rails_6_graphiti_rails.gemfile
+- gemfiles/rails_7.gemfile
+- gemfiles/rails_7_graphiti_rails.gemfile
 - graphiti.gemspec
 - lib/graphiti.rb
 - lib/graphiti/adapters/abstract.rb
@@ -351,17 +348,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs

data/.travis.yml

@@ -1,94 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-- 2.5
-- 2.6
-- 2.7
-gemfile:
-  - Gemfile
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6.gemfile
-  - gemfiles/rails_5_0_graphiti_rails.gemfile
-  - gemfiles/rails_5_1_graphiti_rails.gemfile
-  - gemfiles/rails_5_2_graphiti_rails.gemfile
-  - gemfiles/rails_6_graphiti_rails.gemfile
-env:
-  - COMMAND="standardrb --no-fix --format progress"
-  - COMMAND=rspec
-  - COMMAND=rspec APPRAISAL_INITIALIZED=true
-jobs:
-  allow_failures:
-  - rvm: ruby-head
-  include:
-    - env: COMMAND=rspec
-      gemfile: Gemfile
-      rvm: ruby-head
-  exclude:
-    # Don't run the appraisal version of the specs for the base gemfile
-    - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
-      gemfile: Gemfile
-    # Don't run the standardrb check on any gemfile except the base gemfile
-    # (but run it for each ruby version)
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_4.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_0.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_1.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_2.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_6.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
-    - env: COMMAND="standardrb --no-fix --format progress"
-      gemfile: gemfiles/rails_6_graphiti_rails.gemfile
-    # Don't run the basic versions of the specs for any of the specific gemfiles
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_4.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_0.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_1.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_2.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_6.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
-    - env: COMMAND=rspec
-      gemfile: gemfiles/rails_6_graphiti_rails.gemfile
-
-    # Don't run rails 4 egmfile against any rubies (for some reason?)
-    - gemfile: gemfiles/rails_4.gemfile
-      rvm: 2.5
-    - gemfile: gemfiles/rails_4.gemfile
-      rvm: 2.6
-    - gemfile: gemfiles/rails_4.gemfile
-      rvm: 2.7
-
-script:
-  - bundle _1.17.3_ exec $COMMAND
-
-install: bundle _1.17.3_ install --retry=3 --jobs=3
-before_install:
-- gem install bundler -v '1.17.3'
-deploy:
-  provider: rubygems
-  api_key:
-    secure: aON6EPWgHZXVQs+n/glMjPJ5kMpeR25khDpYlFIM0Ggf2+xuT/yRMtGbNTYnB01v/v2s9tNWK6QlMGARCbKz/W6WS8VNwFxs4DO1IPY3XoyF8QaPlXVKfBLldjUoVx61zL5xtcv8uZqWT1ATY+DjHW3nQ875ss/GW8tw+UASG1uUEuPCE9z+rNa3xYnm2qSZOwhFWqs5bHRQcc3gF3O8Hy8r4aosYTAlYOSeGDToqTUq1Ws21dV4xnIo97Nhmh9SYBQcKpZk1qF9bUz4zqdKsDKAxHMJRShtILmhPxNpIqE5ZV0+Xt+cnwi11AZDhSgfoUqYO9t2uG562luAqTnEZEQl+Lmc+nx4nJTH6tcR3ri301k0O+qDZ3PgSojJvrUuNC8DDLbbsVJNHYycGOLclqQq1aNbgz9HayEE5s+AyklPcprJhngxA5WP80AtONAxxLt4OjrY0X80TvOi2b5nfIN7DowGmcLbRahnms98Yk6/i1vCNV4R9bO0AaqpGLV+L8sVp98Qquk2mpvB3Le4W89qm5int1y2FNJbgInBpY1UOsI3wLENt0npC1X/KVMJKkpHvk80rGccI5FIVRUDZ3YD77hi+s1busPSVQ/+l4QdTFHmWp13Pghf6hNaIwfNwFMHwM2Fkv8YXa4c1mWc1cY5WP1ELS8cEnjtmp/9Iuc=
-  gem: graphiti
-  on:
-    tags: true
-    repo: graphiti-api/graphiti

data/gemfiles/rails_5_0.gemfile

@@ -1,18 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0"
-gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
-gem "database_cleaner"
-
-group :test do
-  gem "pry"
-  gem "pry-byebug", platform: [:mri]
-  gem "appraisal"
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5_0_graphiti_rails.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0"
-gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
-gem "database_cleaner"
-gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
-
-group :test do
-  gem "pry"
-  gem "pry-byebug", platform: [:mri]
-  gem "appraisal"
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5_1_graphiti_rails.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.1"
-gem "rspec-rails"
-gem "sqlite3", "~> 1.3.6"
-gem "database_cleaner"
-gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
-gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
-
-group :test do
-  gem "pry"
-  gem "pry-byebug", platform: [:mri]
-  gem "appraisal"
-  gem "guard"
-  gem "guard-rspec"
-end
-
-gemspec path: "../"