graphiti 1.0.beta.22 → 1.0.beta.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5cc04af9bfdafe229a379fd1c5b3016cfc2e2f
-  data.tar.gz: b45b8a34cd3e066c0861fb9bdf1dfb0cdb1d8a05
+  metadata.gz: 5164c4331d341b2fe6b4d9f52a585ea5786e9322
+  data.tar.gz: 99ff186f3f6a4664655df31218314b12eab85dcf
 SHA512:
-  metadata.gz: 80ea382d0120b44c2d59ec559a17c98274bcad560a5f5863a5b62e33a813e36f247b9949f55a0b46c464bba31f67e4d079e69a33d7e69ee1eb74eca00dc8e91d
-  data.tar.gz: fbfff29b988d97ba4b874cfa983e0d056dc9cd3a05209326665e35722b4f435470866316c6e844d9119373c154d92a10b5935d688c3b8d548aa1712a82f6a925
+  metadata.gz: ef17a7f6650df3b05dca832352c742869d220a197fae136c924cd2955fd74da03e378877638f57075a72f8090c03c1e5e905b96952dd9d8f1bac6749a1f7c5d9
+  data.tar.gz: 9479832a9998c6e24795f9040795239147659faaa6f25d6bedd1d1b5bf32c3c08d3f70d64b3ee708ecd8488b616abbf7ec9bbffb0289225d4e86713ab7fb7a43

data/.travis.yml

@@ -1,14 +1,18 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3
   - 2.4
   - 2.5
+  - 2.6
 
 script: "bundle exec rake"
 
 install: bundle install --retry=3 --jobs=3
 
+#https://docs.travis-ci.com/user/languages/ruby/
+before_install:
+  - gem install bundler -v '< 2'
+
 gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile

data/graphiti.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "activerecord", ['>= 4.1', '< 6']
   spec.add_development_dependency "kaminari", '~> 0.17'
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"

data/lib/generators/graphiti/resource_generator.rb

@@ -78,7 +78,10 @@ module Graphiti
     end
 
     def generate_route
-      code = "resources :#{plural_route_name}"
+      # Rails 5.2 adds `plural_route_name`, fallback to `plural_table_name`
+      plural_name = self.try(:plural_route_name) || plural_table_name
+
+      code = "resources :#{plural_name}"
       code << %{, only: [#{actions.map { |a| ":#{a}" }.join(', ')}]} if actions.length < 5
       code << "\n"
       inject_into_file 'config/routes.rb', after: /ApplicationResource.*$\n/ do

data/lib/graphiti/configuration.rb

@@ -28,7 +28,8 @@ module Graphiti
       self.debug_models = ENV.fetch('GRAPHITI_DEBUG_MODELS', false)
 
       if defined?(::Rails)
-        @schema_path = "#{::Rails.root}/public/schema.json"
+        cfg = YAML.load_file("#{::Rails.root}/.graphiticfg.yml")
+        @schema_path = "#{::Rails.root}/public#{cfg['namespace']}/schema.json"
         self.debug = ::Rails.logger.level.zero?
         Graphiti.logger = ::Rails.logger
       end

data/lib/graphiti/util/persistence.rb

@@ -162,8 +162,11 @@ class Graphiti::Util::Persistence
       iterate(except: [:polymorphic_belongs_to, :belongs_to]) do |x|
         yield x
 
-        x[:object] = x[:sideload].resource
-          .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], caller_model)
+        if x[:sideload].writable?
+          x[:object] = x[:resource]
+            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], caller_model)
+        end
+
         processed << x
       end
     end
@@ -173,7 +176,7 @@ class Graphiti::Util::Persistence
     [].tap do |processed|
       iterate(only: [:polymorphic_belongs_to, :belongs_to]) do |x|
         if x[:sideload].writable?
-          x[:object] = x[:sideload].resource
+          x[:object] = x[:resource]
             .persist_with_relationships(x[:meta], x[:attributes], x[:relationships])
         else
           raise Graphiti::Errors::UnwritableRelationship.new(@resource, x[:sideload])

data/lib/graphiti/util/relationship_payload.rb

@@ -45,12 +45,21 @@ module Graphiti
       def payload_for(sideload, relationship_payload)
         type = relationship_payload[:meta][:jsonapi_type].to_sym
 
-        if sideload.resource.type != type && sideload.polymorphic_parent?
+        # For polymorphic *sideloads*, grab the correct child sideload
+        if sideload.resource.type != type && sideload.type == :polymorphic_belongs_to
           sideload = sideload.child_for_type(type)
         end
+
+        # For polymorphic *resources*, grab the correct child resource
+        resource = sideload.resource
+        if resource.type != type && resource.polymorphic?
+          resource = resource.class.resource_for_type(type).new
+        end
+
         relationship_payload[:meta][:method] ||= :update
 
         {
+          resource: resource,
           sideload: sideload,
           is_polymorphic: sideload.polymorphic_child?,
           primary_key: sideload.primary_key,

data/lib/graphiti/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.22
+  version: 1.0.beta.23
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -124,16 +124,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement