graphiti 1.0.rc.21 → 1.0.rc.22

data/lib/graphiti/adapters/active_record/many_to_many_sideload.rb

@@ -9,21 +9,43 @@ class Graphiti::Adapters::ActiveRecord::ManyToManySideload < Graphiti::Sideload:
   end
 
   def belongs_to_many_filter(scope, value)
-    scope
-      .includes(through_relationship_name)
-      .where(belongs_to_many_clause(value))
+    if polymorphic?
+      clauses = value.group_by { |v| v["type"] }.map { |group|
+        ids = group[1].map { |g| g["id"] }
+        filter_for(scope, ids, group[0])
+      }
+      scope = clauses.shift
+      clauses.each { |c| scope = scope.or(c) }
+      scope
+    else
+      filter_for(scope, value)
+    end
   end
 
-  private
-
-  def belongs_to_many_clause(value)
-    where = { true_foreign_key => value }.tap do |c|
-      if polymorphic?
-        c[foreign_type_column] = foreign_type_value
+  def ids_for_parents(parents)
+    if polymorphic?
+      parents.group_by(&:class).map do |group|
+        {id: super(group[1]), type: group[0].name}.to_json
       end
+    else
+      super
     end
+  end
 
-    { through_table_name => where }
+  private
+
+  def filter_for(scope, value, type = nil)
+    scope
+      .includes(through_relationship_name)
+      .where(belongs_to_many_clause(value, type))
+  end
+
+  def belongs_to_many_clause(value, type)
+    where = {true_foreign_key => value}
+    if polymorphic? && type
+      where[foreign_type_column] = type
+    end
+    {through_table_name => where}
   end
 
   def foreign_type_column
@@ -51,6 +73,6 @@ class Graphiti::Adapters::ActiveRecord::ManyToManySideload < Graphiti::Sideload:
   def infer_foreign_key
     key = parent_reflection.options[:through]
     value = through_reflection.foreign_key.to_sym
-    { key => value }
+    {key => value}
   end
 end

data/lib/graphiti/adapters/graphiti_api.rb

@@ -10,10 +10,10 @@ module Graphiti
         response = resource.make_request(url)
         json = JSON.parse(response.body)
 
-        if json['errors']
+        if json["errors"]
           handle_remote_error(url, json)
         else
-          models = json['data'].map { |d| build_entity(json, d) }
+          models = json["data"].map { |d| build_entity(json, d) }
           Util::RemoteSerializer.for(resource.class.serializer, models)
           models
         end
@@ -22,13 +22,13 @@ module Graphiti
       private
 
       def handle_remote_error(url, json)
-        errors = json['errors'].map do |error|
-          if raw = error['meta'].try(:[], '__raw_error__')
-            { message: raw['message'], backtrace: raw['backtrace'] }
+        errors = json["errors"].map { |error|
+          if (raw = error["meta"].try(:[], "__raw_error__"))
+            {message: raw["message"], backtrace: raw["backtrace"]}
           else
-            { message: "#{error['title']} - #{error['detail']}" }
+            {message: "#{error["title"]} - #{error["detail"]}"}
           end
-        end.compact
+        }.compact
         raise Errors::Remote.new(url, errors)
       end
 
@@ -41,30 +41,30 @@ module Graphiti
       end
 
       def find_entity(json, id, type)
-        lookup = Array(json['data']) | Array(json['included'])
-        lookup.find { |l| l['id'] == id.to_s && l['type'] == type }
+        lookup = Array(json["data"]) | Array(json["included"])
+        lookup.find { |l| l["id"] == id.to_s && l["type"] == type }
       end
 
       def build_entity(json, node)
-        entity = OpenStruct.new(node['attributes'])
-        entity.id = node['id']
-        entity._type = node['type']
-        process_relationships(entity, json, node['relationships'] || {})
+        entity = OpenStruct.new(node["attributes"])
+        entity.id = node["id"]
+        entity._type = node["type"]
+        process_relationships(entity, json, node["relationships"] || {})
         entity
       end
 
       def process_relationships(entity, json, relationship_json)
         entity._relationships = {}
         relationship_json.each_pair do |name, hash|
-          if data = hash['data']
+          if (data = hash["data"])
             if data.is_a?(Array)
               data.each do |d|
-                rel = find_entity(json, d['id'], d['type'])
+                rel = find_entity(json, d["id"], d["type"])
                 related_entity = build_entity(json, rel)
                 add_relationship(entity, related_entity, name, true)
               end
             else
-              rel = find_entity(json, hash['data']['id'], hash['data']['type'])
+              rel = find_entity(json, hash["data"]["id"], hash["data"]["type"])
               related_entity = build_entity(json, rel)
               add_relationship(entity, related_entity, name)
             end

data/lib/graphiti/adapters/null.rb

@@ -68,18 +68,6 @@ module Graphiti
         scope
       end
 
-      def filter_datetime_eq(scope, attribute, value)
-        scope
-      end
-
-      def filter_datetime_not_eq(scope, attribute, value)
-        scope
-      end
-
-      def filter_datetime_lte(scope, attribute, value)
-        scope
-      end
-
       def filter_float_eq(scope, attribute, value)
         scope
       end

data/lib/graphiti/cli.rb

@@ -1,12 +1,12 @@
-require 'thor'
-require 'net/http'
-require 'graphiti'
+require "thor"
+require "net/http"
+require "graphiti"
 
 Thor::Base.shell = Thor::Shell::Color
 
 module Graphiti
   class CLI < Thor
-    desc 'schema_check OLD_SCHEMA NEW_SCHEMA', 'Diff 2 schemas for backwards incompatibilities. Pass file path or URL. If your app relies on JSON Web Tokens, you can set GRAPHITI_TOKEN for authentication'
+    desc "schema_check OLD_SCHEMA NEW_SCHEMA", "Diff 2 schemas for backwards incompatibilities. Pass file path or URL. If your app relies on JSON Web Tokens, you can set GRAPHITI_TOKEN for authentication"
     def schema_check(old, new)
       old = schema_for(old)
       new = schema_for(new)
@@ -25,7 +25,7 @@ module Graphiti
     private
 
     def schema_for(input)
-      if input.starts_with?('http')
+      if input.starts_with?("http")
         JSON.parse(fetch_remote_schema(input))
       else
         JSON.parse(File.read(input))
@@ -35,9 +35,9 @@ module Graphiti
     def fetch_remote_schema(path)
       uri = URI(path)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true if uri.scheme == 'https'
+      http.use_ssl = true if uri.scheme == "https"
       req = Net::HTTP::Get.new(uri)
-      req['Authorization'] = "Token token=\"#{ENV['GRAPHITI_TOKEN']}\""
+      req["Authorization"] = "Token token=\"#{ENV["GRAPHITI_TOKEN"]}\""
       res = http.request(req)
       res.body
     end

data/lib/graphiti/configuration.rb

@@ -10,13 +10,14 @@ module Graphiti
 
     attr_accessor :respond_to
     attr_accessor :context_for_endpoint
-    attr_accessor :schema_path
     attr_accessor :links_on_demand
     attr_accessor :pagination_links_on_demand
     attr_accessor :pagination_links
     attr_accessor :typecast_reads
-    attr_accessor :debug
-    attr_accessor :debug_models
+
+    attr_reader :debug, :debug_models
+
+    attr_writer :schema_path
 
     # Set defaults
     # @api private
@@ -28,13 +29,13 @@ module Graphiti
       @pagination_links_on_demand = false
       @pagination_links = false
       @typecast_reads = true
-      self.debug = ENV.fetch('GRAPHITI_DEBUG', true)
-      self.debug_models = ENV.fetch('GRAPHITI_DEBUG_MODELS', false)
+      self.debug = ENV.fetch("GRAPHITI_DEBUG", true)
+      self.debug_models = ENV.fetch("GRAPHITI_DEBUG_MODELS", false)
 
       if defined?(::Rails)
-        if File.exists?("#{::Rails.root}/.graphiticfg.yml")
+        if File.exist?("#{::Rails.root}/.graphiticfg.yml")
           cfg = YAML.load_file("#{::Rails.root}/.graphiticfg.yml")
-          @schema_path = "#{::Rails.root}/public#{cfg['namespace']}/schema.json"
+          @schema_path = "#{::Rails.root}/public#{cfg["namespace"]}/schema.json"
         else
           @schema_path = "#{::Rails.root}/public/schema.json"
         end
@@ -44,7 +45,7 @@ module Graphiti
     end
 
     def schema_path
-      @schema_path ||= raise('No schema_path defined! Set Graphiti.config.schema_path to save your schema.')
+      @schema_path ||= raise("No schema_path defined! Set Graphiti.config.schema_path to save your schema.")
     end
 
     def debug=(val)
@@ -58,13 +59,11 @@ module Graphiti
     end
 
     def with_option(key, value)
-      begin
-        original = send(key)
-        send(:"#{key}=", value)
-        yield
-      ensure
-        send(:"#{key}=", original)
-      end
+      original = send(key)
+      send(:"#{key}=", value)
+      yield
+    ensure
+      send(:"#{key}=", original)
     end
   end
 end

data/lib/graphiti/context.rb

@@ -11,7 +11,7 @@ module Graphiti
     included do
       class_attribute :sideload_allowlist
       self.sideload_allowlist = {}
-      class << self;prepend Overrides;end
+      class << self; prepend Overrides; end
     end
   end
 end

data/lib/graphiti/debugger.rb

@@ -10,19 +10,17 @@ module Graphiti
 
     class << self
       def on_data(name, start, stop, id, payload)
-        took = ((stop-start)*1000.0).round(2)
+        took = ((stop - start) * 1000.0).round(2)
         params = scrub_params(payload[:params])
 
         if payload[:exception]
           on_data_exception(payload, params)
-        else
-          if payload[:sideload]
-            if payload[:results]
-              on_sideload_data(payload, params, took)
-            end
-          else
-            on_primary_data(payload, params, took)
+        elsif payload[:sideload]
+          if payload[:results]
+            on_sideload_data(payload, params, took)
           end
+        else
+          on_primary_data(payload, params, took)
         end
       end
 
@@ -30,7 +28,7 @@ module Graphiti
         unless payload[:exception_object].instance_variable_get(:@__graphiti_debug)
           add_chunk do |logs, json|
             logs << ["\n=== Graphiti Debug ERROR", :red, true]
-            if sideload = payload[:sideload]
+            if (sideload = payload[:sideload])
               logs << ["#{sideload.parent_resource.class}: Sideload \"#{sideload.name}\"", :red, true]
               json[:parent_resource] = sideload.parent_resource.class.name
               json[:sideload] = sideload.name
@@ -39,22 +37,20 @@ module Graphiti
               query = "#{payload[:resource].class.name}.all(#{JSON.pretty_generate(params)}).data"
               logs << [query, :cyan, true]
               logs << ["The error occurred when running the above query. Copy/paste it into a rake task or Rails console session to reproduce. Keep in mind you may have to set context.", :yellow, true]
-              json[:query] = query
             else
               query = "This sideload is done manually via .scope - no debug information available."
               logs << [query, :cyan, true]
-              json[:query] = query
             end
+            json[:query] = query
+
             logs << "\n\n"
-            if payload[:exception_object]
-              payload[:exception_object].instance_variable_set(:@__graphiti_debug, json)
-            end
+            payload[:exception_object]&.instance_variable_set(:@__graphiti_debug, json)
           end
         end
       end
 
       def results(raw_results)
-        raw_results.map { |r| "[#{r.class.name}, #{r.id.inspect}]" }.join(', ')
+        raw_results.map { |r| "[#{r.class.name}, #{r.id.inspect}]" }.join(", ")
       end
 
       def on_sideload_data(payload, params, took)
@@ -94,7 +90,7 @@ module Graphiti
 
       def on_render(name, start, stop, id, payload)
         add_chunk do |logs|
-          took = ((stop-start)*1000.0).round(2)
+          took = ((stop - start) * 1000.0).round(2)
           logs << [""]
           logs << ["=== Graphiti Debug", :green, true]
           logs << ["Rendering:", :green, true]
@@ -109,7 +105,7 @@ module Graphiti
             yield
           ensure
             flush
-            self.chunks = [] unless self.preserve
+            self.chunks = [] unless preserve
           end
         else
           yield
@@ -125,7 +121,7 @@ module Graphiti
       end
 
       def flush
-        Graphiti.broadcast('debug.flush', {}) do |payload|
+        Graphiti.broadcast("debug.flush", {}) do |payload|
           payload[:chunks] = chunks
           graph_statements.each do |chunk|
             flush_chunk(chunk)
@@ -138,26 +134,26 @@ module Graphiti
       def scrub_params(params)
         params ||= {}
         params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
-        params.reject! { |k,v| [:controller, :action, :format, :debug].include?(k.to_sym) }
-        params.reject! { |k,v| k.to_sym == :include }
+        params.reject! { |k, v| [:controller, :action, :format, :debug].include?(k.to_sym) }
+        params.reject! { |k, v| k.to_sym == :include }
         params.deep_symbolize_keys
       end
 
       def add_chunk(resource = nil, parent = nil)
         logs, json = [], {}
         yield(logs, json)
-        self.chunks << {
+        chunks << {
           resource: resource,
           parent: parent,
           logs: logs,
           json: json,
-          children: []
+          children: [],
         }
       end
 
       def graph_statements
         @chunks.each do |chunk|
-          if parent = chunk[:parent]
+          if (parent = chunk[:parent])
             relevant = chunks.find { |c| c[:resource] == parent }
             relevant[:children].unshift(chunk) if relevant
           end
@@ -179,7 +175,7 @@ module Graphiti
 
       def flush_chunk(chunk, depth = 0)
         chunk[:logs].each do |args|
-          indent = '   ' * depth
+          indent = "   " * depth
           args[0] = "#{indent}#{args[0]}"
           Graphiti.log(*args)
         end
@@ -191,8 +187,8 @@ module Graphiti
     end
 
     ActiveSupport::Notifications.subscribe \
-      'graphiti.data', method(:on_data)
+      "graphiti.data", method(:on_data)
     ActiveSupport::Notifications.subscribe \
-      'graphiti.render', method(:on_render)
+      "graphiti.render", method(:on_render)
   end
 end

data/lib/graphiti/delegates/pagination.rb

@@ -10,12 +10,12 @@ module Graphiti
       end
 
       def links
-        @links ||= {  }.tap do |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.select {|k, v| !v.nil? }
       end
 
       private
@@ -27,11 +27,11 @@ module Graphiti
 
         # Overwrite the pagination query params with the desired page
         uri.query = @proxy.query.hash.merge({
-                                             page: {
-                                               number: page,
-                                               size: page_size
-                                             }
-                                           }).to_query
+          page: {
+            number: page,
+            size: page_size,
+          },
+        }).to_query
         uri.to_s
       end
 
@@ -50,10 +50,10 @@ module Graphiti
         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)
+          unless @item_count.is_a?(Numeric)
             raise TypeError, "#{@proxy.resource}.stat(:total, :count) returned an invalid value #{@item_count}"
           end
-        rescue => e
+        rescue
           # FIXME: Unable to log because of how rspec mocks were
           # created for the logger. In other words, logging here will
           # break tests.

data/lib/graphiti/deserializer.rb

@@ -47,7 +47,7 @@
 class Graphiti::Deserializer
   def initialize(payload)
     @payload = payload
-    @payload = @payload[:_jsonapi] if @payload.has_key?(:_jsonapi)
+    @payload = @payload[:_jsonapi] if @payload.key?(:_jsonapi)
   end
 
   def params
@@ -73,9 +73,7 @@ class Graphiti::Deserializer
 
   # Override the attributes
   # # @see #attributes
-  def attributes=(attrs)
-    @attributes = attrs
-  end
+  attr_writer :attributes
 
   # 'meta' information about this resource. Includes:
   #
@@ -88,7 +86,7 @@ class Graphiti::Deserializer
     {
       type: data[:type],
       temp_id: data[:'temp-id'],
-      method: action
+      method: action,
     }
   end
 
@@ -164,12 +162,12 @@ class Graphiti::Deserializer
 
   def process_relationship_datum(datum)
     temp_id = datum[:'temp-id']
-    included_object = included.find do |i|
+    included_object = included.find { |i|
       next unless i[:type] == datum[:type]
 
       (i[:id] && i[:id] == datum[:id]) ||
         (i[:'temp-id'] && i[:'temp-id'] == temp_id)
-    end
+    }
     included_object ||= {}
     included_object[:relationships] ||= {}
 
@@ -183,10 +181,10 @@ class Graphiti::Deserializer
       meta: {
         jsonapi_type: datum[:type],
         temp_id: temp_id,
-        method: method
+        method: method,
       },
       attributes: attributes,
-      relationships: relationships
+      relationships: relationships,
     }
   end