graphiti 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d55ad609644e718abecd160c32841a49fd66123c901a17c809279df9edc47e01
-  data.tar.gz: eb67647f916696ee9664619076335eaa5e19407b63b2a504b582e9fee9cf6e17
+SHA1:
+  metadata.gz: d05460b6a49369c5102162e0cbacdd96d6bf53df
+  data.tar.gz: c44ad2f829d173b13cedbde8ee85b65b8b81658d
 SHA512:
-  metadata.gz: 92c82864cf79cc8e2bed3d87b1add842a5ac5f70aaf2fe130f2e03e9c44bc7a78e473121564f4bb7c7dca1617aba1df90b529d5724df4d61378ee27848bd4047
-  data.tar.gz: eb049661cd88e8636c658566d3c4fc882e13bbe6de33aa50744c4561404d4aef937bcbad66406886940d8dec388655b674fcab0efac9ac01fecbe35bc4d08cd1
+  metadata.gz: 7f6bc99a0a2706ff959bb7ea2753767e3f4973a0ca5ca9c78eed7a1f40fc62a73ca0acdf159634ba0c186fcc98463e3fa5237bef19d61757036746783e6c92a3
+  data.tar.gz: f5dbcf2d737ffc8f98d45cf2da48ec5be3b252356efd1a654fe150e8197996b08e69413aafd3219d0673f3f92dcbf1dfc0ac448499a0ce67a54d772a0de671b5

data/lib/graphiti/configuration.rb

@@ -43,7 +43,7 @@ module Graphiti
         end
 
         if (logger = ::Rails.logger)
-          self.debug = logger.level.zero?
+          self.debug = logger.level.zero? && self.debug
           Graphiti.logger = logger
         end
       end

data/lib/graphiti/sideload.rb

@@ -18,30 +18,32 @@ module Graphiti
       :link_proc
 
     def initialize(name, opts)
-      @name = name
+      @name                          = name
       validate_options!(opts)
-      @parent_resource_class = opts[:parent_resource]
-      @resource_class        = opts[:resource]
-      @primary_key           = opts[:primary_key]
-      @foreign_key           = opts[:foreign_key]
-      @type                  = opts[:type]
-      @base_scope            = opts[:base_scope]
-      @readable              = opts[:readable]
-      @writable              = opts[:writable]
-      @as                    = opts[:as]
-      @link                  = opts[:link]
-      @single                = opts[:single]
-      @remote                = opts[:remote]
+      @parent_resource_class         = opts[:parent_resource]
+      @resource_class                = opts[:resource]
+      @primary_key                   = opts[:primary_key]
+      @foreign_key                   = opts[:foreign_key]
+      @type                          = opts[:type]
+      @base_scope                    = opts[:base_scope]
+      @readable                      = opts[:readable]
+      @writable                      = opts[:writable]
+      @as                            = opts[:as]
+      @link                          = opts[:link]
+      @single                        = opts[:single]
+      @remote                        = opts[:remote]
       apply_belongs_to_many_filter if type == :many_to_many
 
-      @description           = opts[:description]
+      @description                   = opts[:description]
 
       # polymorphic has_many
-      @polymorphic_as        = opts[:polymorphic_as]
+      @polymorphic_as                = opts[:polymorphic_as]
       # polymorphic_belongs_to-specific
-      @group_name            = opts[:group_name]
-      @polymorphic_child     = opts[:polymorphic_child]
-      @parent                = opts[:parent]
+      @group_name                    = opts[:group_name]
+      @polymorphic_child             = opts[:polymorphic_child]
+      @parent                        = opts[:parent]
+      @always_include_resource_ids   = opts[:always_include_resource_ids]
+
       if polymorphic_child?
         parent.resource.polymorphic << resource_class
       end
@@ -112,6 +114,10 @@ module Graphiti
       !!@polymorphic_as
     end
 
+    def always_include_resource_ids?
+      !!@always_include_resource_ids
+    end
+
     def link?
       return true if link_proc
 

data/lib/graphiti/sideload/belongs_to.rb

@@ -1,4 +1,9 @@
 class Graphiti::Sideload::BelongsTo < Graphiti::Sideload
+  def initialize(name, opts)
+    opts = { always_include_resource_ids: true }.merge(opts)
+    super(name, opts)
+  end
+
   def type
     :belongs_to
   end

data/lib/graphiti/util/serializer_relationships.rb

@@ -53,14 +53,16 @@ module Graphiti
         proc do
           data { instance_eval(&data_proc_ref) }
 
+          # include relationship links for belongs_to relationships
+          # https://github.com/graphiti-api/graphiti/issues/167
+          linkage always: sideload_ref.always_include_resource_ids?
+
           if link_ref
             if @proxy.query.links?
               self_ref.send(:validate_link!) unless self_ref.send(:eagerly_validate_links?)
 
               link(:related) do
-                if self_ref
-                  ::Graphiti::Util::Link.new(sideload_ref, @object).generate
-                end
+                ::Graphiti::Util::Link.new(sideload_ref, @object).generate
               end
             end
           end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -344,7 +344,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs