introspective_grape 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6a41c1400168ecda38b06734cdd3678071328a
-  data.tar.gz: ce20e1fc247df07463068dade8bc7e6ccfeb4e7c
+  metadata.gz: 7a3c90f61cd6c0cfcc681b4c4c37f1b888bfe7fd
+  data.tar.gz: 26e6dcb9a96899eaaf5c298d9ffe7c48e6d43ea4
 SHA512:
-  metadata.gz: 6cd190fef2c67c05f7e6f472458686d347f1e70d64960f3909439203b032627e899ecdce9966a81046e08eb164007b91cf13a35b62555cf144c43e3d3b9f2c0e
-  data.tar.gz: 256ae7c47d140a34431bdb400b24ae703d25a48ded09e8639c54a4ca5cacf7f3f5ea50602226b8bb2510f15013df90763a9d56e141f9fcef1683d944b30e99be
+  metadata.gz: a11bec2f1cde26753b08898c14ba54339f6a984be48f1eea1090c4f585146d2db4c35980481852f02b4f1c1a78090a7ff0da25238dd4b27da76281c1ae0e9080
+  data.tar.gz: d1e1a33bbab8952ca376c1ebc52a9c55c379405698c2479af8898500ff924437578fedb37b1743dc3494674fa5fc6b81d8486d7dfbbcb2637515afe05c2e51e2

data/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+0.3.5 09/14/2018
+================
+
+Restrict IntrospectiveGrape to Rails <5.0 and Pundit <2.0. We aren't Rails 5 compat until either schema_plus is or we find an alternative. Pundit 2.0 very strangely makes 'authorize' a protected method and we haven't made time to investigate.
+
+The big update in 0.3 is that the PUT/POST actions used to reload the model on presentation (hooks elsewhere may leave a model that's been updated out of sync with the database, so the overhead seems to be necessary) without using the default_includes for eager loading, causing some N+1 problems that could be alleviated.
+
+The general strategy of passing the params of a nested endpoint to the root model and then reloading it and burrowing down to the leaf for presentation, while simpler to implement, was really not optimal and creates a lot of unnecessary overhead like that.
+
+
 0.2.9 04/06/2017
 ================
 

data/introspective_grape.gemspec

@@ -20,14 +20,16 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.0'
 
-  s.add_dependency "rails", '>= 3.0.0'
+  # not yet 5+ compatible
+  s.add_dependency "rails", '>= 3.0.0', '<5.0'
 
   s.add_dependency 'grape'          #, '~> 0.16.2'
   s.add_dependency 'grape-entity'   #, '< 0.5.0'
   s.add_dependency 'grape-swagger'  #, '~>0.11.0'
   s.add_dependency 'kaminari', '< 1.0' # There's a version 1.0.0 out there that breaks everything
   s.add_dependency 'grape-kaminari'
-  s.add_dependency 'pundit'
+  # Pundit 2.0 mysteriously made authorize a protected method...
+  s.add_dependency 'pundit', '<2.0'
   s.add_dependency 'camel_snake_keys', '>0.0.4'
 
   if RUBY_PLATFORM == 'java'

data/lib/introspective_grape/api.rb

@@ -225,8 +225,10 @@ module IntrospectiveGrape
           authorize @model, :update?
 
           @model.update_attributes!( safe_params(params).permit(klass.whitelist) )
+         
+          default_includes = routes.first.klass.default_includes(routes.first.model)
 
-          present klass.find_leaf(routes, @model.reload, params), with: "#{klass}::#{model}Entity".constantize
+          present klass.find_leaf(routes, @model.class.includes(default_includes).find(@model.id), params), with: "#{klass}::#{model}Entity".constantize
         end
       end
 
@@ -252,9 +254,9 @@ module IntrospectiveGrape
           # 2) For nested endpoints convert the params hash into Rails-compliant nested
           #    attributes, to be passed to the root instance for update. This keeps
           #    behavior consistent between bulk and single record updates.
+
           if params[root.key]
-            default_includes = routes.size > 1 ? [] : klass.default_includes(root.model)
-            @model = root.model.includes( default_includes ).find(params[root.key])
+            @model = root.model.includes( klass.default_includes(root.model) ).find(params[root.key])
           end
 
           if routes.size > 1

data/lib/introspective_grape/create_helpers.rb

@@ -15,7 +15,12 @@ module IntrospectiveGrape
       model = routes.first.model.new( dsl.send(:safe_params,params).permit(whitelist) )
       dsl.authorize model, :create?
       model.save!
-      find_leaves(routes, model.reload, params)
+
+      # reload the model with eager loading
+      default_includes = routes.first.klass.default_includes(routes.first.model)
+      model = model.class.includes(default_includes).find(model.id) if model.persisted?
+
+      find_leaves(routes, model, params)
     end
 
   end

data/lib/introspective_grape/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveGrape
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.5".freeze
 end

data/spec/dummy/app/models/image.rb

@@ -3,7 +3,7 @@ require 'paperclip'
 class Image < ActiveRecord::Base
   belongs_to :imageable, polymorphic: true
 
-  has_attached_file :file, styles: {medium: "300x300>", thumb: "100x100"},
+  has_attached_file :file, #styles: {medium: "300x300>", thumb: "100x100"},
     url: "/system/:imageable_type/:imageable_id/:id/:style/:filename"
 
   validates_attachment :file, content_type: {content_type: ["image/jpeg", "image/png", "image/gif"]}

data/spec/requests/user_api_spec.rb

@@ -156,6 +156,7 @@ describe Dummy::UserAPI, type: :request do
 
       put "/api/v1/users/#{user.id}", params
 
+      p response.body
       response.should be_success
       json['avatar_url'].should eq Image.last.file.url(:medium)
       user.avatar.should     eq Image.last
@@ -167,6 +168,7 @@ describe Dummy::UserAPI, type: :request do
 
       post "/api/v1/users/#{user.id}/avatars", params
 
+      p response.body
       response.should be_success
       user.avatar.should     == Image.last
       user.avatar_url.should == Image.last.file.url(:medium)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: introspective_grape
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +104,16 @@ dependencies:
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: camel_snake_keys
   requirement: !ruby/object:Gem::Requirement
@@ -431,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Introspectively configure deeply nested RESTful Grape APIs for ActiveRecord