jsonapi_actions 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7715c24debc264384b44d0d58e7c35bb233933a5d7ce65dac9cf1d5b7442a20
-  data.tar.gz: d4280a01b00fa35db370ffa051a6bdab451400d3a4517097e0901ddf2237dbc5
+  metadata.gz: dd75b7ea62934cf27cc351d4327cf302af2ab1f5aed66d6d6075575e974d90b6
+  data.tar.gz: 56008596f5f59e8eb0640b2d0be4b81eed49dd6fdc7e0f08af5d9f10fc683687
 SHA512:
-  metadata.gz: 1b3ede4f07f319d0fbef81a168ce9d98c84e81a2685df7ea826c347f85ae6502e4a45a275e8e5886e539aeab8c12fad19090f9a7db163242383214772b2e2338
-  data.tar.gz: 3a3e17111e6759c9c79494873b61a4da4993e7d0c59cd03419368ebd6bf8a385c3b136068b5da4692d9d5917ff9eb74bdb4b3e0e541892508ad94d10bc66e664
+  metadata.gz: 709f2ae770a5efbfca5252997c866205a898eb85cc77dddc5517a936d99910e169f7767ecd1a677ec33b4aef30157236528260e9d629cb937578250fb489350b
+  data.tar.gz: 47e353f3fa687d0ee7a8463dfa412b110982bfcf10c2f294084603bce6f12d29ae937befb795549be5b3bc36f59ce2c9a2f85c4368a2c0a217a57c79159f93c5

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.2.2] - 2020-05-18
+### Fixed
+- JsonapiActions#json_response uses `defined?` to check for serializer library

data/Gemfile.lock

@@ -1,119 +1,134 @@
 PATH
   remote: .
   specs:
-    jsonapi_actions (0.1.0)
+    jsonapi_actions (0.1.2)
       kaminari (>= 1.0, < 2.0)
-      rails (>= 4.0, < 6.0)
+      rails (>= 4.0, < 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (6.0.2.2)
+      actionpack (= 6.0.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailbox (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activestorage (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
+      zeitwerk (~> 2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     diff-lcs (1.3)
-    erubi (1.8.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    kaminari (1.1.1)
+    kaminari (1.2.0)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.0)
+      kaminari-activerecord (= 1.2.0)
+      kaminari-core (= 1.2.0)
+    kaminari-actionview (1.2.0)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-activerecord (1.2.0)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    loofah (2.2.3)
+      kaminari-core (= 1.2.0)
+    kaminari-core (1.2.0)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    method_source (1.0.0)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
+    minitest (5.14.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.6)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (6.0.2.2)
+      actioncable (= 6.0.2.2)
+      actionmailbox (= 6.0.2.2)
+      actionmailer (= 6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actiontext (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 6.0.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -127,20 +142,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -148,7 +164,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   jsonapi_actions!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -1,7 +1,8 @@
 # JsonapiActions
 
 Instantly create flexible API controllers that are compatible with [JSON:API](https://jsonapi.org/). 
-Utilize your existing [FastJsonapi](https://github.com/Netflix/fast_jsonapi) or 
+Utilize your existing [JSONAPI::Serializer](https://github.com/jsonapi-serializer/jsonapi-serializer), 
+[FastJsonapi](https://github.com/Netflix/fast_jsonapi), or 
 [ActiveModel::Serializer](https://github.com/rails-api/active_model_serializers) serialization library, or bring your 
 own. Scope and authenticate with optional [Pundit](https://github.com/varvet/pundit) policies and/or Controller specific 
 methods. 
@@ -24,8 +25,7 @@ $ bundle install
 
 ### Basic Setup
 
-Include the `JsonapiActions::ErrorHandling` and `JsonapiActions::ErrorHandling` modules in 
-your base controller.
+Include `JsonapiActions` in your base controller.
 
 ```ruby
 # app/controllers/api/v1/base_controller.rb
@@ -60,7 +60,6 @@ Rails.application.routes.draw do
     end
   end
 end
-
 ```
 
 ### parent_scope
@@ -140,7 +139,7 @@ end
 ```
 
 ### #json_response
-Response data is formatted so that it can be rendered with `FastJsonapi` or `ActiveModel::Serializer`.
+Response data is formatted so that it can be rendered with `JSONAPI::Serializer`, `FastJsonapi`, or `ActiveModel::Serializer`.
 If you are using a different serializer, or would like to further change the response.  Then you will need to override
 `#response`, which defines the arguments for `render`.
 
@@ -163,7 +162,7 @@ end
 
 ## Pundit
 
-JsonapiActions are built to use Pundit for authorization.  We utilize action authorization, policy scope, 
+JsonapiActions is built to use Pundit for authorization.  We utilize action authorization, policy scope, 
 and permitted params.
 
 ```ruby

data/jsonapi_actions.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kevin Pheasey"]
   spec.email         = ["kevin@kpsoftware.io"]
 
-  spec.summary       = "Rails JSONAPI Controller Actions"
-  spec.description   = "Implement Rails JSONAPI compliant controller actions."
+  spec.summary       = "Rails JSON:API Controller Actions"
+  spec.description   = "Implement Rails JSON:API compliant controller actions."
   spec.homepage      = "https://github.com/kp-software/jsonapi_actions"
   spec.license       = "MIT"
 
@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency 'rails', '>= 4.0', '< 6.0'
+  spec.add_dependency 'rails', '>= 4.0', '< 7.0'
   spec.add_dependency 'kaminari', '>= 1.0', '< 2.0'
 end

data/lib/jsonapi_actions.rb

@@ -120,11 +120,11 @@ module JsonapiActions
 
     def page
       @page ||= begin
-        page = {}
-        page[:number] = (params.dig(:page, :number) || 1).to_i
-        page[:size] = [[(params.dig(:page, :size) || 20).to_i, 1000].min, 1].max
-        page
-      end
+                  page = {}
+                  page[:number] = (params.dig(:page, :number) || 1).to_i
+                  page[:size] = [[(params.dig(:page, :size) || 20).to_i, 1000].min, 1].max
+                  page
+                end
     end
 
     def set_record
@@ -174,7 +174,7 @@ module JsonapiActions
     end
 
     def json_response(data, options = {})
-      if Gem::Specification.find_by_name('fast_jsonapi')
+      if defined?(JSONAPI::Serializer) || defined?(FastJsonapi)
         {
           json: serializer(data).new(data, options.deep_merge(
             include: include_param,
@@ -185,7 +185,7 @@ module JsonapiActions
           )
         }
 
-      elsif Gem::Specification.find_by_name('active_model_serializers')
+      elsif defined?(ActiveModel::Serializer)
         { json: data }.merge(meta: metadata, include: include_param).merge(options)
 
       else
@@ -194,10 +194,21 @@ module JsonapiActions
     end
 
     def serializer(data = nil)
-      self.class.serializer ||
-        data.try(:serializer_class) ||
-        data.try(:first).try(:serializer_class) ||
-        "#{model.name}Serializer".constantize
+      serializer_classes = [
+        self.class.serializer,
+        data.try(:serializer_class),
+        "#{data.class.name}Serializer".safe_constantize,
+        data.try(:first).try(:serializer_class),
+        "#{data.try(:first).class.name}Serializer".safe_constantize
+      ].compact
+
+      if serializer_classes.any?
+        serializer_classes.first
+      else
+        "#{model.name}Serializer".safe_constantize
+      end
+    rescue NoMethodError, NameError
+      raise 'Unknown serializer'
     end
 
     def eager_load(records)

data/lib/jsonapi_actions/version.rb

@@ -1,3 +1,3 @@
 module JsonapiActions
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_actions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kevin Pheasey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Implement Rails JSONAPI compliant controller actions.
+description: Implement Rails JSON:API compliant controller actions.
 email:
 - kevin@kpsoftware.io
 executables: []
@@ -104,6 +104,7 @@ files:
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -123,7 +124,7 @@ homepage: https://github.com/kp-software/jsonapi_actions
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
-summary: Rails JSONAPI Controller Actions
+summary: Rails JSON:API Controller Actions
 test_files: []