graphiti 1.0.alpha.19 → 1.0.alpha.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87db44b8b56a2b6341dd62b0d1ef7bdf37703127
-  data.tar.gz: 934774ad413a6ac695b612253249620efc0f7c9b
+  metadata.gz: 3e748663dcd4e93cbaaf9304a1d5690863f0ff5d
+  data.tar.gz: 056c6acfc9aa1c68509a8e650b8dc0da393262d3
 SHA512:
-  metadata.gz: 51ca1feec8cc701fd3786449d747f5ea44f72fd4e533fcb598793f74dc550e87aaa39a53eb4144e623653503a690a25d9ce2bf84b1bae253a66d92e5d84ab2fb
-  data.tar.gz: bf9acf3ecc4b5be6db1bc9d3e46c3591b59d48391bfa941fedf3c525418e8a8d393d91fee4ba9745e25a2fda1d92fb4499f500be323a55524a8c5cee2e72b9d8
+  metadata.gz: 4a80207f722f242e74182f7b2029739cd13db051554ccf09dfc97815f1c8c1d17a89f0b7f2e945f75e4be4461c4cc1c4bbde3afbe392d4059087110b1def1678
+  data.tar.gz: 5001801f9b0f0ed74f127f6efce115e307b79dc18a08fa9a662a3a1b7b8b3602b8d7b6bb2d620f9b14f7ec271ee70dd19160fe7ce775f4836289a0ae3ce9b775

data/lib/generators/graphiti/install_generator.rb

@@ -26,6 +26,10 @@ module Graphiti
         app_controller_code
       end
 
+      inject_into_file 'config/application.rb', after: "Rails::Application\n" do
+"    routes.default_url_options[:host] = ENV.fetch('HOST', 'http://localhost:3000')\n"
+      end
+
       insert_into_file "config/routes.rb", :after => "Rails.application.routes.draw do\n" do
         <<-STR
   scope path: ApplicationResource.endpoint_namespace, defaults: { format: :jsonapi } do

data/lib/generators/graphiti/templates/application_resource.rb.erb

@@ -10,5 +10,6 @@ class ApplicationResource < Graphiti::Resource
   <%- end -%>
   self.abstract_class = true
   self.adapter = Graphiti::Adapters::ActiveRecord
+  self.base_url = Rails.application.routes.default_url_options[:host]
   self.endpoint_namespace = '<%= api_namespace %>'
 end

data/lib/generators/graphiti/templates/create_request_spec.rb.erb

@@ -23,7 +23,6 @@ RSpec.describe "<%= type %>#create", type: :request do
         make_request
       }.to change { <%= model_class %>.count }.by(1)
       <%= var %> = <%= model_class %>.last
-      # assert on properties
       expect(response.status).to eq(201)
     end
   end

data/lib/generators/graphiti/templates/index_request_spec.rb.erb

@@ -15,7 +15,7 @@ RSpec.describe "<%= type %>#index", type: :request do
       expect(<%= resource_class %>).to receive(:all).and_call_original
       make_request
       expect(response.status).to eq(200)
-      expect(d.map(&:jsonapi_type).uniq).to eq(['<%= type %>'])
+      expect(d.map(&:jsonapi_type).uniq).to match_array(['<%= type %>'])
       expect(d.map(&:id)).to match_array([<%= var %>1.id, <%= var %>2.id])
     end
   end

data/lib/generators/graphiti/templates/update_request_spec.rb.erb

@@ -27,8 +27,6 @@ RSpec.describe "<%= type %>#update", type: :request do
         make_request
       }.to change { <%= var %>.reload.attributes }
       expect(response.status).to eq(200)
-
-      # ... assert updates attributes ...
     end
   end
 end

data/lib/graphiti/errors.rb

@@ -258,12 +258,28 @@ Only one resource can be associated to a given url/verb combination.
     end
 
     class PolymorphicResourceChildNotFound < Base
-      def initialize(resource_class, model)
+      def initialize(resource_class, type: nil, model: nil)
         @resource_class = resource_class
         @model = model
+        @type = type
       end
 
       def message
+        @model ? model_message : type_message
+      end
+
+      def model_message
+        <<-MSG
+#{@resource_class}: Tried to find Resource subclass with model #{@model.class}, but nothing found!
+
+Make sure all your child classes are assigned and associated to the right models:
+
+# One of these should be assocated to model #{@model.class}:
+self.polymorphic = ['Subclass1Resource', 'Subclass2Resource']
+        MSG
+      end
+
+      def type_message
         <<-MSG
 #{@resource_class}: Tried to find Resource subclass with model #{@model.class}, but nothing found!
 
@@ -474,13 +490,13 @@ Consider using a named relationship instead, e.g. 'has_one :top_comment'
     end
 
     class InvalidInclude < Base
-      def initialize(resource_class, relationship)
-        @resource_class = resource_class
+      def initialize(resource, relationship)
+        @resource = resource
         @relationship = relationship
       end
 
       def message
-"#{@resource_class.name}: The requested included relationship \"#{@relationship}\" is not supported."
+"#{@resource.class.name}: The requested included relationship \"#{@relationship}\" is not supported."
       end
     end
 

data/lib/graphiti/query.rb

@@ -236,7 +236,7 @@ module Graphiti
     def handle_missing_sideload(name)
       if Graphiti.config.raise_on_missing_sideload
         raise Graphiti::Errors::InvalidInclude
-          .new(name, @resource.type)
+          .new(@resource, name)
       end
     end
 

data/lib/graphiti/resource/polymorphism.rb

@@ -16,17 +16,19 @@ module Graphiti
         end
       end
 
-      def associate_all(parent, children, association_name, type)
-        children.each do |c|
-          associate(parent, c, association_name, type)
-        end
+      def associate_all(*args)
+        _associate(:associate_all, *args)
+      end
+
+      def associate(*args)
+        _associate(:associate, *args)
       end
 
-      def associate(parent, child, association_name, type)
+      def _associate(meth, parent, other, association_name, type)
         child_resource = self.class.resource_for_model(parent)
         if child_resource.sideloads[association_name]
           child_resource.new.adapter
-            .associate(parent, child, association_name, type)
+            .send(meth, parent, other, association_name, type)
         end
       end
 
@@ -55,10 +57,19 @@ module Graphiti
           end
         end
 
+        def resource_for_type(type)
+          resource = children.find { |c| c.type == type }
+          if resource.nil?
+            raise Errors::PolymorphicResourceChildNotFound.new(self, type: type)
+          else
+            resource
+          end
+        end
+
         def resource_for_model(model)
           resource = children.find { |c| model.is_a?(c.model) }
           if resource.nil?
-            raise Errors::PolymorphicResourceChildNotFound.new(self, model)
+            raise Errors::PolymorphicResourceChildNotFound.new(self, model: model)
           else
             resource
           end

data/lib/graphiti/resource/sideloading.rb

@@ -57,15 +57,15 @@ module Graphiti
           allow_sideload(name, opts, &blk)
         end
 
-        def belongs_to_many(name, resource: nil, as:, &blk)
-          resource = resource ||= Util::Class.infer_resource_class(self, name)
-          sideload = resource.sideload(as)
-
-          _resource = resource
-          filter sideload.true_foreign_key, resource.attributes[:id][:type] do
-            eq do |scope, value|
-              _resource.new.adapter.belongs_to_many_filter(sideload, scope, value)
+        def polymorphic_has_many(name, opts = {}, as:, &blk)
+          opts[:foreign_key] ||= :"#{as}_id"
+          _model = model
+          has_many name, opts do
+            params do |hash|
+              hash[:filter][:"#{as}_type"] = _model.name
             end
+
+            instance_eval(&blk) if block_given?
           end
         end
 

data/lib/graphiti/sideload.rb

@@ -32,6 +32,7 @@ module Graphiti
       @as                    = opts[:as]
       @link                  = opts[:link]
       @single                = opts[:single]
+      apply_belongs_to_many_filter if type == :many_to_many
 
       # polymorphic-specific
       @group_name            = opts[:group_name]
@@ -262,6 +263,16 @@ module Graphiti
 
     private
 
+    def apply_belongs_to_many_filter
+      _self = self
+      fk_type = parent_resource_class.attributes[:id][:type]
+      resource_class.filter true_foreign_key, fk_type do
+        eq do |scope, value|
+          _self.resource.adapter.belongs_to_many_filter(_self, scope, value)
+        end
+      end
+    end
+
     def load_options(parents, query)
       {}.tap do |opts|
         opts[:default_paginate] = false

data/lib/graphiti/util/persistence.rb

@@ -15,6 +15,13 @@ class Graphiti::Util::Persistence
     @attributes.each_pair do |key, value|
       @attributes[key] = @resource.typecast(key, value, :writable)
     end
+
+    # Find the correct child resource for a given jsonapi type
+    if meta_type = @meta[:type].try(:to_sym)
+      if @resource.type != meta_type && @resource.polymorphic?
+        @resource = @resource.class.resource_for_type(meta_type).new
+      end
+    end
   end
 
   # Perform the actual save logic.

data/lib/graphiti/util/relationship_payload.rb

@@ -43,9 +43,10 @@ module Graphiti
       end
 
       def payload_for(sideload, relationship_payload)
-        if sideload.polymorphic_parent?
-          type     = relationship_payload[:meta][:jsonapi_type]
-          sideload = sideload.child_for_type(type.to_sym)
+        type = relationship_payload[:meta][:jsonapi_type].to_sym
+
+        if sideload.resource.type != type && sideload.polymorphic_parent?
+          sideload = sideload.child_for_type(type)
         end
         relationship_payload[:meta][:method] ||= :update
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.19"
+  VERSION = "1.0.alpha.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.19
+  version: 1.0.alpha.20
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable