graphiti 1.0.alpha.9 → 1.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caacb7b46b4b6380d1202102d599ea89292883e4
-  data.tar.gz: e1817089ad066f588c1b7b4d43e595e923bd93fc
+  metadata.gz: d73c18bd56aa9ce3103c3e1be9d6aa53df14d246
+  data.tar.gz: da7f2ff960fb4592610dfb6ea30a5ff981378bda
 SHA512:
-  metadata.gz: c77ef723750a6220eafec17a1312886c75cb20e60fda62ea1a648916c8ddedf4f670abd0be7b7a62806755036aa674f78bb8ec98e587df2c8304e6c89c678d33
-  data.tar.gz: 97aa9cf93a8af91459b402b2379c81a461330fd47a467c5eb79a4a768569a6c15ba4ad2238f08bb41d7563607918d7b30c2dfdc2be5197e8d97cfaf77a3f6fe0
+  metadata.gz: 69a8290f78ca0abcee5971e6ffec58c3884d9f81a44f5b2bb59967cfb18311cb9274ad3329689b31c338586347fa2089df0d82e136d1d74a91c2073d591062a3
+  data.tar.gz: ac000566edc5afc1c05af3db4a179454a9766da798995b3c35fcdda9bc01bbff40d697b598c217b39619378a8052f56c7961e931c44ced3663361e9950409503

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 :typecast_reads
 
     # Set defaults
     # @api private
@@ -20,6 +21,7 @@ module Graphiti
       @concurrency = false
       @respond_to = [:json, :jsonapi, :xml]
       @links_on_demand = false
+      @typecast_reads = true
 
       if defined?(::Rails)
         @schema_path = "#{::Rails.root}/public/schema.json"

data/lib/graphiti/jsonapi_serializable_ext.rb

@@ -35,25 +35,6 @@ module Graphiti
       end
     end
 
-    # Temporary fix until fixed upstream
-    # https://github.com/jsonapi-rb/jsonapi-serializable/pull/102
-    module ResourceOverrides
-      def requested_relationships(fields)
-        @_relationships
-      end
-
-      # Allow access to resource methods
-      def method_missing(id, *args, &blk)
-        if @resource.respond_to?(id, true)
-          @resource.send(id, *args, &blk)
-        else
-          super
-        end
-      end
-    end
-
-    JSONAPI::Serializable::Resource
-      .send(:prepend, ResourceOverrides)
     JSONAPI::Serializable::Relationship
       .send(:prepend, RelationshipOverrides)
     JSONAPI::Serializable::Renderer

data/lib/graphiti/resource.rb

@@ -25,9 +25,11 @@ module Graphiti
     end
 
     def decorate_record(record)
-      serializer = serializer_for(record)
-      record.instance_variable_set(:@__graphiti_serializer, serializer)
-      record.instance_variable_set(:@__graphiti_resource, self)
+      unless record.instance_variable_get(:@__graphiti_serializer)
+        serializer = serializer_for(record)
+        record.instance_variable_set(:@__graphiti_serializer, serializer)
+        record.instance_variable_set(:@__graphiti_resource, self)
+      end
     end
 
     def with_context(object, namespace = nil)

data/lib/graphiti/util/serializer_attributes.rb

@@ -75,7 +75,12 @@ module Graphiti
         _resource = @resource.new
         _typecast = typecast(Graphiti::Types[@attr[:type]][:read])
         ->(_) {
-          _typecast.call(@object.send(_name))
+          val = @object.send(_name)
+          if Graphiti.config.typecast_reads
+            _typecast.call(val)
+          else
+            val
+          end
         }
       end
 
@@ -84,7 +89,12 @@ module Graphiti
         _name = @name
         _typecast = typecast(Graphiti::Types[@attr[:type]][:read])
         ->(serializer_instance = nil) {
-          _typecast.call(serializer_instance.instance_eval(&inner))
+          val = serializer_instance.instance_eval(&inner)
+          if Graphiti.config.typecast_reads
+            _typecast.call(val)
+          else
+            val
+          end
         }
       end
 

data/lib/graphiti/util/serializer_relationships.rb

@@ -38,21 +38,40 @@ module Graphiti
       private
 
       def block
-        if link?
+        if _link = link?
           validate_link! unless @sideload.link_proc
-          sl = @sideload
-          proc do
+        end
+
+        _sl = @sideload
+        _data_proc = data_proc
+        proc do
+          data { instance_eval(&_data_proc) }
+
+          if _link
             if @proxy.query.links?
               link(:related) do
-                ::Graphiti::Util::Link.new(sl, @object).generate
+                ::Graphiti::Util::Link.new(_sl, @object).generate
               end
             end
           end
-        else
-          proc { }
         end
       end
 
+      def data_proc
+        _sl = @sideload
+        ->(_) {
+          if records = @object.public_send(_sl.name)
+            if records.respond_to?(:to_ary)
+              records.each { |r| _sl.resource.decorate_record(r) }
+            else
+              _sl.resource.decorate_record(records)
+            end
+
+            records
+          end
+        }
+      end
+
       def validate_link!
         unless Graphiti.config.context_for_endpoint
           raise Errors::Unlinkable.new(@resource_class, @sideload)

data/lib/graphiti/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.9
+  version: 1.0.alpha.10
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable