graphiti 1.0.rc.9 → 1.0.rc.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b671896a39d2dbafcbba2aeff6f28b84975716c5
-  data.tar.gz: '08d51b340c5311838a386a6b623140b52b4f9109'
+  metadata.gz: 5e7e1bd6105f9bf95c5ba1a627045076ab9eb829
+  data.tar.gz: 935d68b3b664e3afaa2c7d2894a55d1bab25fff8
 SHA512:
-  metadata.gz: 656b61085599d072b1af3d04e0356170e796c0bb02b1d7dabea43fffcc61ad14c4df6c9ef2c7fdb309e3c1fabcf5cfdecb694d99e66243a18fc11a1e982c6611
-  data.tar.gz: fa1068a26baeae8bdadcd3fe3406e8b15cfc7baa86e50edba8cd073916b9266df6fbd7d599bc147c0f01e29c59e80290775820c12bc7232da300fbff76279f87
+  metadata.gz: 683b046c667a6321edc27c3b5622d5c63f36cc72facd81adb056c8d49a0a8caf51120996efe22966f32f18e4edb6c699fd234cdb8a81153e9ee10967d5da2c14
+  data.tar.gz: 84a831d72e7f826c74668d717e24fbcf520dbe702b2f783a0838100a2b8d9f0b192c88363a94fe7f65a443a3f6cf0e453b23d087b6bbfa90ed9eed83de37bf64

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .byebug_history
 spec/dummy/log/*
+*~

data/lib/graphiti.rb

@@ -53,6 +53,7 @@ require "graphiti/scoping/default_filter"
 require "graphiti/scoping/filter"
 require "graphiti/stats/dsl"
 require "graphiti/stats/payload"
+require "graphiti/delegates/pagination"
 require "graphiti/util/include_params"
 require "graphiti/util/field_params"
 require "graphiti/util/hash"

data/lib/graphiti/configuration.rb

@@ -12,6 +12,7 @@ module Graphiti
     attr_accessor :context_for_endpoint
     attr_accessor :schema_path
     attr_accessor :links_on_demand
+    attr_accessor :pagination_links_on_demand
     attr_accessor :typecast_reads
     attr_accessor :debug
     attr_accessor :debug_models
@@ -23,6 +24,7 @@ module Graphiti
       @concurrency = false
       @respond_to = [:json, :jsonapi, :xml]
       @links_on_demand = false
+      @pagination_links_on_demand = false
       @typecast_reads = true
       self.debug = ENV.fetch('GRAPHITI_DEBUG', true)
       self.debug_models = ENV.fetch('GRAPHITI_DEBUG_MODELS', false)

data/lib/graphiti/delegates/pagination.rb

@@ -0,0 +1,77 @@
+module Graphiti
+  module Delegates
+    class Pagination
+      def initialize(proxy)
+        @proxy = proxy
+      end
+
+      def links?
+        @proxy.query.pagination_links?
+      end
+
+      def links
+        @links ||= {  }.tap do |links|
+          links[:first] = pagination_link(1)
+          links[:last] = pagination_link(last_page)
+          links[:prev] = pagination_link(current_page - 1) unless current_page == 1
+          links[:next] = pagination_link(current_page + 1) unless current_page == last_page
+        end.select{|k,v| !v.nil? }
+      end
+
+      private
+
+      def pagination_link(page)
+        return nil unless @proxy.resource.endpoint
+
+        uri = URI(@proxy.resource.endpoint[:url].to_s)
+
+        # Overwrite the pagination query params with the desired page
+        uri.query = @proxy.query.hash.merge({
+                                             page: {
+                                               number: page,
+                                               size: page_size
+                                             }
+                                           }).to_query
+        uri.to_s
+      end
+
+      def last_page
+        return @last_page if @last_page || page_size == 0
+        @last_page = (item_count / page_size)
+        @last_page += 1 if item_count % page_size > 0
+        @last_page
+      end
+
+      def item_count
+        begin
+          return @item_count if @item_count
+          @item_count = @proxy.resource.stat(:total, :count).call(@proxy.scope.unpaginated_object, :total)
+          unless @item_count.kind_of?(Numeric)
+            raise TypeError, "#{@proxy.resource}.stat(:total, :count) returned an invalid value #{@item_count}"
+          end
+        rescue => e
+          # FIXME: Unable to log because of how rspec mocks were
+          # created for the logger. In other words, logging here will
+          # break tests.
+
+          # Graphiti.logger.warn(e.message)
+          @item_count = 0
+        end
+      end
+
+      def current_page
+        @current_page ||= (page_param[:number] || 1).to_i
+      end
+
+      def page_size
+        @page_size ||= (page_param[:size] ||
+                        @proxy.resource.default_page_size ||
+                        Graphiti::Scoping::Paginate::DEFAULT_PAGE_SIZE).to_i
+      end
+
+      def page_param
+        @page_param ||= (@proxy.query.hash[:page] || {})
+      end
+    end
+  end
+end

data/lib/graphiti/query.rb

@@ -30,6 +30,14 @@ module Graphiti
       end
     end
 
+    def pagination_links?
+      if Graphiti.config.pagination_links_on_demand
+        [true, 'true'].include?(@params[:pagination_links])
+      else
+        true
+      end
+    end
+
     def debug_requested?
       !!@params[:debug]
     end

data/lib/graphiti/renderer.rb

@@ -44,6 +44,7 @@ module Graphiti
         options[:expose][:extra_fields] = proxy.extra_fields
         options[:expose][:proxy] = proxy
         options[:include] = proxy.include_hash
+        options[:links] = proxy.pagination.links if proxy.pagination.links?
         options[:meta] ||= {}
         options[:meta].merge!(stats: proxy.stats) unless proxy.stats.empty?
         options[:meta][:debug] = Debugger.to_a if debug_json?

data/lib/graphiti/resource_proxy.rb

@@ -80,6 +80,10 @@ module Graphiti
       end
     end
 
+    def pagination
+      @pagination ||= Delegates::Pagination.new(self)
+    end
+
     def save(action: :create)
       # TODO: remove this. Only used for persisting many-to-many with AR
       # (see activerecord adapter)

data/lib/graphiti/scope.rb

@@ -1,7 +1,7 @@
 module Graphiti
   class Scope
     attr_accessor :object, :unpaginated_object
-
+    attr_reader :pagination
     def initialize(object, resource, query, opts = {})
       @object    = object
       @resource  = resource

data/lib/graphiti/util/link.rb

@@ -14,11 +14,21 @@ module Graphiti
       end
 
       def generate
-        on_demand_links(raw_url)
+        if linkable?
+          on_demand_links(raw_url)
+        end
       end
 
       private
 
+      def linkable?
+        if @sideload.type == :belongs_to
+          not @model.send(@sideload.foreign_key).nil?
+        else
+          true
+        end
+      end
+
       def raw_url
         if @sideload.link_proc
           @sideload.link_proc.call(@model)

data/lib/graphiti/util/validation_response.rb

@@ -59,6 +59,8 @@ class Graphiti::Util::ValidationResponse
       if payload.is_a?(Array)
         related_objects = model.send(name)
         related_objects.each_with_index do |r, index|
+          method = payload[index].try(:[], :meta).try(:[], :method)
+          next if [nil, :destroy, :disassociate].include?(method)
           valid = valid_object?(r)
           checks << valid
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.9"
+  VERSION = "1.0.rc.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.rc.9
+  version: 1.0.rc.10
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -281,6 +281,7 @@ files:
 - lib/graphiti/configuration.rb
 - lib/graphiti/context.rb
 - lib/graphiti/debugger.rb
+- lib/graphiti/delegates/pagination.rb
 - lib/graphiti/deserializer.rb
 - lib/graphiti/errors.rb
 - lib/graphiti/extensions/boolean_attribute.rb