power_api 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9ac70fd373bcfa86774718053e2a050a63cf01edaf3b795ae32974f84d4316
-  data.tar.gz: 987dfb777a07a02ceffb510d2e958e66295a2a7b032f4b59589c7b46466f9554
+  metadata.gz: f30cc23f12f0428c77e7cc2e7820a6bc4bf72d70a8a838abf282ad96b29ae42c
+  data.tar.gz: 55a91a55c8cafbb1b666c4c79c48ac1511d13c23efe79dbe357764bfd251b021
 SHA512:
-  metadata.gz: 91645d4b96ce2956214e9520a17111907935507a756b15a6b76c6a1703deb39b5a6b70da33432c4dce90b8d3407c89e3639082311c311013f64230904b9f1031
-  data.tar.gz: a7fc3106279ad4b52c8da096e9367e9c4c90e6ea10d504e4f7f3f54d07bfdfdc764b2512a432a4597aebd1fbcdda560590bb9df9e288beffbf0adeb28d179e62
+  metadata.gz: 49af821bffae3dd6f23f6c89a7fcaad73ae9132237ba39b1ff9c8caf754bb7a48c2cb230b71c0bc633b241cb40afc7c34ba9458ceded143fd0e4473bebea14ba
+  data.tar.gz: a01937e2ca67e188cd9ea275197f4ad8a7931288c6eaf1b3189d75b66bbafe4c25a3a963c078ad0835e2ef5e749cf274c3dbd20aa37030b584d10abf969ff4de

data/.circleci/config.yml

@@ -94,11 +94,11 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby-version: ["2.6", "2.7"]
+              ruby-version: ["2.7"]
       - deploy:
           context: org-global
           filters:
             tags:
               only: /.*/
             branches:
-              ignore: /.*/
+              ignore: /.*/

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### v2.1.1
+
+* Fix: add `nil` handling in the `serialize_resource` view helper.
+
 ### v2.1.0
 
 * Swagger has been deleted from the Exposed Api version.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    power_api (2.1.0)
+    power_api (2.1.1)
       active_model_serializers (~> 0.10.0)
       api-pagination
       kaminari
@@ -315,4 +315,4 @@ DEPENDENCIES
   sqlite3 (~> 1.4.2)
 
 BUNDLED WITH
-   2.2.24
+   2.4.10

data/app/helpers/power_api/application_helper.rb

@@ -4,8 +4,7 @@ module PowerApi
 
     def serialize_resource(resource, options = {})
       load_default_serializer_options(options)
-      serializable = ActiveModelSerializers::SerializableResource.new(resource, options)
-      serialized_data = serializable.serializable_hash
+      serialized_data = serialize_data(resource, options)
       render_serialized_data(serialized_data, options)
     rescue NoMethodError => e
       if e.message.include?("undefined method `serializable_hash'")
@@ -19,12 +18,19 @@ module PowerApi
 
     private
 
+    def serialize_data(resource, options)
+      return {} if resource.nil?
+
+      serializable = ActiveModelSerializers::SerializableResource.new(resource, options)
+      serializable.serializable_hash
+    end
+
     def render_serialized_data(serialized_data, options)
       output_format = options.delete(:output_format)
-      serialized_data = serialized_data[:root] if options[:root] == :root
+      serialized_data = serialized_data.fetch(:root, serialized_data)
       return serialized_data if output_format == :hash
 
-      serialized_data.to_json
+      serialized_data.presence.to_json
     end
 
     def load_default_serializer_options(options)

data/lib/power_api/version.rb

@@ -1,3 +1,3 @@
 module PowerApi
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/dummy/spec/helpers/power_api/application_helper_spec.rb

@@ -97,6 +97,13 @@ describe PowerApi::ApplicationHelper do
       it { expect(data).to eq(expected_serialized_data) }
     end
 
+    context "with nil resource" do
+      let(:resource) { nil }
+      let(:expected_serialized_data) { "null" }
+
+      it { expect(data).to eq(expected_serialized_data) }
+    end
+
     context "with invalid resource" do
       let(:resource) do
         { invalid: "resource" }
@@ -130,6 +137,13 @@ describe PowerApi::ApplicationHelper do
 
         it { expect(data).to eq(expected_serialized_data) }
       end
+
+      context "with nil resource" do
+        let(:resource) { nil }
+        let(:expected_serialized_data) { {} }
+
+        it { expect(data).to eq(expected_serialized_data) }
+      end
     end
 
     context "with invalid output option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: power_api
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Platanus
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails