snfoil-rails 0.4.5 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4aa9e8502480e615c440aca9f2bc70f507b94dc0a2e57a9c0b3d02cb2cb9d2d
-  data.tar.gz: d607d2fe7c5c1c8dd9ff69bace09247f3ec721fd5c1e4767592f6e7ad182dfb9
+  metadata.gz: f2e314fff30b93ada5ce0fcecbfbc7ee6798df23bdc990311dd167937861b335
+  data.tar.gz: 11362362a7feefaa15cb8ccc27eaba14f49c0bc3cdc81fdf6b7d26b32062b72b
 SHA512:
-  metadata.gz: 25c8f8f25014f15a828795c95630e16714dd66f31bf50355819737b576a1248dcd0e592b33fd1b114b9a4fdbede8253f981b7246eade81d8654301c53949ff62
-  data.tar.gz: 99d2655356d0afea93703aa84768ebf90e91835e2d8eef689c6eafeca5bd659b02b37e9057f14785d806391fd69256936b768f497f7eabd7a68a40f246aa68ba
+  metadata.gz: 000b0f05e6295477bdb55dd6b26edecd7b236078ed80fef5c5e1e93696ec5eea1c63ad9efba69e88a14b4b51e4e67bce23e7022ae3330c733b19df1d72d9925c
+  data.tar.gz: ad0fc2f266dc5fa51224b3e4e764bc6d5c0b9279ba95cd717f766c738aff812dbb4bbe05df351ce7d7e9189288e0d30740700c39dd5efa51bd16ee75254b300d

data/lib/sn_foil/controller/api.rb

@@ -40,27 +40,38 @@ module SnFoil
 
       def render_change(model, **options)
         if model.errors.empty?
-          render json: serializer(**options).new(model, **options).serializable_hash
+          params
+          render json: serializer(**options).new(model,
+                                                 **options,
+                                                 params: (options[:controller_params] || options[:params] || {})
+                                                           .merge(current_entity: current_entity)).serializable_hash
         else
-          render model.errors, status: :unprocessable_entity
+          render json: model.errors, status: :unprocessable_entity
         end
       end
 
       def render_destroy(model, **_options)
         if model.errors.empty?
-          render status: :no_content
+          render json: {}, status: :no_content
         else
-          render model.errors, status: :unprocessable_entity
+          render json: model.errors, status: :unprocessable_entity
         end
       end
 
       def render_index(results, **options)
-        render json: serializer(**options).new(paginate(results, **options), **options, meta: meta(results, **options))
+        render json: serializer(**options).new(paginate(results, **options),
+                                               **options,
+                                               params: (options[:controller_params] || options[:params] || {})
+                                                         .merge(current_entity: current_entity),
+                                               meta: meta(results, **options))
                                           .serializable_hash
       end
 
       def render_show(model, **options)
-        render json: serializer(**options).new(model, **options).serializable_hash
+        render json: serializer(**options).new(model,
+                                               **options,
+                                               params: (options[:controller_params] || options[:params] || {})
+                                                         .merge(current_entity: current_entity)).serializable_hash
       end
 
       private

data/lib/sn_foil/controller/concerns/index_controller_concern.rb

@@ -50,6 +50,7 @@ module SnFoil
         end
 
         def meta(results, **options)
+          results = paginate(results, **options)
           total_pages = results.respond_to?(:total_pages) ? results.total_pages : nil
           total_count = results.respond_to?(:total_count) ? results.total_count : nil
 

data/lib/sn_foil/controller/concerns/setup_controller_concern.rb

@@ -28,7 +28,7 @@ module SnFoil
         end
 
         def current_context(**options)
-          @current_context ||= context(**options).new(context_user)
+          @current_context ||= context(**options).new(context_entity)
         end
 
         protected
@@ -75,7 +75,8 @@ module SnFoil
           options
         end
 
-        def context_user
+        def context_entity
+          return current_entity if defined? current_entity
           return current_user if defined? current_user
         end
       end

data/lib/sn_foil/rails/version.rb

@@ -2,6 +2,6 @@
 
 module SnFoil
   module Rails
-    VERSION = '0.4.5'
+    VERSION = '0.5.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfoil-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.3
 platform: ruby
 authors:
 - Matthew Howes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
-  name: fast_jsonapi
+  name: jsonapi-serializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: snfoil
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +85,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement