graphiti 1.0.beta.21 → 1.0.beta.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f78e16b388d5c025b539286778286b8bf0f811
-  data.tar.gz: 3d1a9f2ca018295e04e23397f5c896f0a41402cb
+  metadata.gz: 8e5cc04af9bfdafe229a379fd1c5b3016cfc2e2f
+  data.tar.gz: b45b8a34cd3e066c0861fb9bdf1dfb0cdb1d8a05
 SHA512:
-  metadata.gz: 49f849661b7552e18876f3e1e424c4dc9d7b645e42c9de6550532ade53315605354db3aba07153083e611235566fa3616e847f670d93609b30279929a18e0c2b
-  data.tar.gz: b1924964f374bd0c404a1a948220d6fc4b0af9380ab9fcf412a7e5791f7530ec224622454771043b987d1580aee0aaf54ea9dda4de9e05447bba24d8500a1039
+  metadata.gz: 80ea382d0120b44c2d59ec559a17c98274bcad560a5f5863a5b62e33a813e36f247b9949f55a0b46c464bba31f67e4d079e69a33d7e69ee1eb74eca00dc8e91d
+  data.tar.gz: fbfff29b988d97ba4b874cfa983e0d056dc9cd3a05209326665e35722b4f435470866316c6e844d9119373c154d92a10b5935d688c3b8d548aa1712a82f6a925

data/lib/generators/graphiti/api_test_generator.rb

@@ -31,27 +31,27 @@ module Graphiti
 
     def generate_api_specs
       if actions?('index')
-        to = "spec/api/v1/#{dir}/index_spec.rb"
+        to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "index_spec.rb")
         template('index_request_spec.rb.erb', to)
       end
 
       if actions?('show')
-        to = "spec/api/v1/#{dir}/show_spec.rb"
+        to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "show_spec.rb")
         template('show_request_spec.rb.erb', to)
       end
 
       if actions?('create')
-        to = "spec/api/v1/#{dir}/create_spec.rb"
+        to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "create_spec.rb")
         template('create_request_spec.rb.erb', to)
       end
 
       if actions?('update')
-        to = "spec/api/v1/#{dir}/update_spec.rb"
+        to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "update_spec.rb")
         template('update_request_spec.rb.erb', to)
       end
 
       if actions?('destroy')
-        to = "spec/api/v1/#{dir}/destroy_spec.rb"
+        to = File.join("spec", ApplicationResource.endpoint_namespace, dir, "destroy_spec.rb")
         template('destroy_request_spec.rb.erb', to)
       end
     end

data/lib/generators/graphiti/install_generator.rb

@@ -27,10 +27,19 @@ module Graphiti
       end
 
       inject_into_file 'config/application.rb', after: "Rails::Application\n" do
-<<-'TXT'
-    argv_options = Rails::Server::Options.new.parse!(ARGV)
-    routes.default_url_options[:host] = ENV.fetch('HOST', "http://#{argv_options[:Host]}:#{argv_options[:Port]}")
-TXT
+<<-'RUBY'
+    # In order for Graphiti to generate links, you need to set the routes host.
+    # When not explicitly set, via the HOST env var, this will fall back to
+    # the rails server settings.
+    # Rails::Server is not defined in console or rake tasks, so this will only
+    # use those defaults when they are available.
+    routes.default_url_options[:host] = ENV.fetch('HOST') do
+      if defined?(Rails::Server)
+        argv_options = Rails::Server::Options.new.parse!(ARGV)
+        "http://#{argv_options[:Host]}:#{argv_options[:Port]}"
+      end
+    end
+RUBY
       end
 
       inject_into_file 'spec/rails_helper.rb', after: /RSpec.configure.+^end$/m do

data/lib/graphiti/resource/interface.rb

@@ -21,6 +21,7 @@ module Graphiti
           _find(params, base_scope)
         end
 
+        # @api private
         def _find(params = {}, base_scope = nil)
           id = params[:data].try(:[], :id) || params.delete(:id)
           params[:filter] ||= {}

data/lib/graphiti/resource_proxy.rb

@@ -91,6 +91,16 @@ module Graphiti
           @payload.relationships
       end
       @data, success = validator.to_a
+
+      if success
+        # If the context namespace is `update` or `create`, certain
+        # adapters will cause N+1 validation calls, so lets explicitly
+        # switch to a lookup context.
+        Graphiti.with_context(Graphiti.context[:object], :show) do
+          @scope.resolve_sideloads([@data])
+        end
+      end
+
       success
     end
 
@@ -113,7 +123,10 @@ module Graphiti
     end
 
     def include_hash
-      @payload ? @payload.include_hash : @query.include_hash
+      @include_hash ||= begin
+        base = @payload ? @payload.include_hash : {}
+        base.deep_merge(@query.include_hash)
+      end
     end
 
     def fields

data/lib/graphiti/scope.rb

@@ -27,34 +27,12 @@ module Graphiti
         if @opts[:after_resolve]
           @opts[:after_resolve].call(resolved)
         end
-        sideload(resolved) unless @query.sideloads.empty?
+        resolve_sideloads(resolved) unless @query.sideloads.empty?
         resolved
       end
     end
 
-    private
-
-    def broadcast_data
-      opts = {
-        resource: @resource,
-        params: @opts[:params],
-        sideload: @opts[:sideload],
-        parent: @opts[:parent]
-      }
-      Graphiti.broadcast("data", opts) do |payload|
-        yield payload
-      end
-    end
-
-    # Used to ensure the resource's serializer is used
-    # Not one derived through the usual jsonapi-rb logic
-    def assign_serializer(records)
-      records.each do |r|
-        @resource.decorate_record(r)
-      end
-    end
-
-    def sideload(results)
+    def resolve_sideloads(results)
       return if results == []
 
       concurrent = Graphiti.config.concurrency
@@ -92,6 +70,28 @@ module Graphiti
       end
     end
 
+    private
+
+    def broadcast_data
+      opts = {
+        resource: @resource,
+        params: @opts[:params],
+        sideload: @opts[:sideload],
+        parent: @opts[:parent]
+      }
+      Graphiti.broadcast("data", opts) do |payload|
+        yield payload
+      end
+    end
+
+    # Used to ensure the resource's serializer is used
+    # Not one derived through the usual jsonapi-rb logic
+    def assign_serializer(records)
+      records.each do |r|
+        @resource.decorate_record(r)
+      end
+    end
+
     def apply_scoping(scope, opts)
       @object = scope
       opts[:default_paginate] = false unless @query.paginate?

data/lib/graphiti/types.rb

@@ -7,7 +7,11 @@ module Graphiti
 
     WriteDateTime = create(::DateTime) do |input|
       if input.is_a?(::Date) || input.is_a?(::Time)
-        input = ::DateTime.parse(input.to_s)
+        input = if input.respond_to?(:to_datetime)
+                  input.to_datetime
+                else
+                  ::DateTime.parse(input.to_s)
+                end
       end
       input = Dry::Types['json.date_time'][input]
       Dry::Types['strict.date_time'][input] if input
@@ -15,7 +19,11 @@ module Graphiti
 
     ReadDateTime = create(::DateTime) do |input|
       if input.is_a?(::Date) || input.is_a?(::Time)
-        input = ::DateTime.parse(input.to_s)
+        input = if input.respond_to?(:to_datetime)
+                  input.to_datetime
+                else
+                  ::DateTime.parse(input.to_s)
+                end
       end
       input = Dry::Types['json.date_time'][input]
       Dry::Types['strict.date_time'][input].iso8601 if input

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.beta.21"
+  VERSION = "1.0.beta.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.21
+  version: 1.0.beta.22
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable