graphiti 1.0.beta.11 → 1.0.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3817c5eb61324763c5381d8c08028a084582990d
-  data.tar.gz: 1159861050a883d131a3900b4b214ef0ed52eb27
+  metadata.gz: '043921a30ecb1c68470cf1cc6e889095b431bbb1'
+  data.tar.gz: 1804468d3679aeef8f43f23202e4c76f9f05d4e5
 SHA512:
-  metadata.gz: 3ff6ca0dd9db8aac5b84ca500264131a28845b8b01daa3789c6fd0574ff47d26412784173ba553fa3d5d506e2e7082999a4c61a0c99bd3130cecccbf00a0f392
-  data.tar.gz: a93ea8aff07090144b646fbdd173521fbaff553d894374a0e2a14cebb9cdd833a4a288223a7271559c37833ff3bc5df31734b94dcbfbd344d840b6e3a1354ed7
+  metadata.gz: 0c60f1bf7e34464d7f669d36f9832f5c421687b4e0da3a5cb1d3bb4e3dd02cad72af994b6998531fdf6081519627dc551ba0ecac4edd4676b89dfa54562e86c3
+  data.tar.gz: 247a3fc07599f2674153fc62b35f7cb8084d0b154a0254a0e7287bb322f62a5e4deace96bacd71007f5cba931a8c31ee2a0feefe91463c6fcce6cac087fcb15e

data/graphiti.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "activemodel", ['>= 4.1', '< 6']
-  spec.add_development_dependency "graphiti_spec_helpers", '>= 1.0.beta.3'
+  spec.add_development_dependency "graphiti_spec_helpers", '1.0.beta.4'
 end

data/lib/graphiti/configuration.rb

@@ -47,5 +47,15 @@ module Graphiti
       @debug_models = val
       Debugger.debug_models = val
     end
+
+    def with_option(key, value)
+      begin
+        original = send(key)
+        send(:"#{key}=", value)
+        yield
+      ensure
+        send(:"#{key}=", original)
+      end
+    end
   end
 end

data/lib/graphiti/serializer.rb

@@ -22,6 +22,12 @@ module Graphiti
       end
     end
 
+    def as_jsonapi(*)
+      super.tap do |hash|
+        strip_relationships!(hash) if strip_relationships?
+      end
+    end
+
     # Temporary fix until fixed upstream
     # https://github.com/jsonapi-rb/jsonapi-serializable/pull/102
     def requested_relationships(fields)
@@ -36,5 +42,20 @@ module Graphiti
         super
       end
     end
+
+    private
+
+    def strip_relationships!(hash)
+      hash[:relationships].select! do |name, payload|
+        payload.has_key?(:data)
+      end
+      hash.delete(:relationships) if hash[:relationships].empty?
+    end
+
+    def strip_relationships?
+      return false unless Graphiti.config.links_on_demand
+      params = Graphiti.context[:object].params || {}
+      [false, nil, 'false'].include?(params[:links])
+    end
   end
 end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.beta.11"
+  VERSION = "1.0.beta.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.11
+  version: 1.0.beta.12
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -200,16 +200,16 @@ dependencies:
   name: graphiti_spec_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.beta.3
+        version: 1.0.beta.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.beta.3
+        version: 1.0.beta.4
 description: 
 email:
 - richmolj@gmail.com