grape-active_model_serializers 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae3a400f492d5ceea5ac3f6cf516b76487f29bba1dd4689d559ebe09d1b38eff
-  data.tar.gz: 1358b3656b5acd6c516cffa2199e4800474e855d5fa4c52854d1cd73c3eb82da
+  metadata.gz: db6f7b71969bf7057afab913332afdde64802ce421a734fc126478aa59e11b54
+  data.tar.gz: a23316e534ab62048931a4bd89bd760386f21df2d09da217087870d37f315409
 SHA512:
-  metadata.gz: 1661311cfb871028cb7f7020b940cc924f01a05a2dd27e0bd11b8dd090ed57937e940a3a21e23765384fd1ae796929afdd6e9afa171207d86721f323aa591461
-  data.tar.gz: 9e52fa9aac9e61a5401c2900b55c24405d07101a21126632393e0abfd14b19cffafc25f594e1cdd53f0824192c94e8576ede697e9ebc594aceff35a8ec0fb258
+  metadata.gz: bf457042825fc75cd646693ada46332edb446e24238817ee8b046e50ec86dcab12eb630158ac5787fb3bdc74756aaf8f67867d6428c8806d398945c72dc3a6e3
+  data.tar.gz: 12b69e7331afa7529ccc7bb213cbd3f3e3892524cf0bdbd632773801dbf0d1bf4fbbf3b6f727a6bd2d34017e1544e08631adb64c9b675c337589dbc24df6f5a5

data/.github/workflows/ci.yml

@@ -22,6 +22,7 @@ jobs:
     strategy:
       matrix:
         ruby-version: [3.4.4, 3.3.8, 3.2.8, 3.1.7]
+        grape-version: ['~> 2.3.0', '~> 3.0']
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -29,5 +30,9 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Install dependencies
         run: bundle install --jobs 4 --retry 3
+        env:
+          GRAPE_VERSION: ${{ matrix.grape-version }}
       - name: Run tests
         run: bundle exec rake
+        env:
+          GRAPE_VERSION: ${{ matrix.grape-version }}

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+### 2.0.1 (2025/12/08)
+
+* [#92](https://github.com/ruby-grape/grape-active_model_serializers/pull/92): Fix: accept nil serializer - [@mateusnava](https://github.com/mateusnava).
+* [#100](https://github.com/ruby-grape/grape-active_model_serializers/pull/100): Fix compatibility with Grape 3.0 and test in CI - [@samsonjs](https://github.com/samsonjs).
+
 ### 2.0.0 (2025/06/02)
 
 * [#96](https://github.com/ruby-grape/grape-active_model_serializers/pull/96): Add compatibility for Grape 2.3 - [@samsonjs](https://github.com/samsonjs).

data/lib/grape-active_model_serializers/options_builder.rb

@@ -49,11 +49,7 @@ module Grape
       end
 
       def innermost_scope
-        if endpoint.respond_to?(:namespace_stackable)
-          endpoint.namespace_stackable(:namespace).last
-        else
-          endpoint.settings.peek[:namespace]
-        end
+        endpoint.inheritable_setting.namespace_stackable[:namespace]&.last
       end
 
       def meta_options

data/lib/grape-active_model_serializers/serializer_resolver.rb

@@ -17,12 +17,14 @@ module Grape
       def serializer_class
         return @serializer_class if defined?(@serializer_class)
 
-        @serializer_class = resource_defined_class
-        @serializer_class ||= collection_class
-        @serializer_class ||= options[:serializer]
-        @serializer_class ||= namespace_inferred_class
-        @serializer_class ||= version_inferred_class
-        @serializer_class ||= resource_serializer_class
+        return nil if options.key?(:serializer) && options[:serializer].nil?
+
+        @serializer_class = resource_defined_class ||
+                            collection_class ||
+                            options[:serializer] ||
+                            namespace_inferred_class ||
+                            version_inferred_class ||
+                            resource_serializer_class
       end
 
       def serializer_options

data/lib/grape-active_model_serializers/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module ActiveModelSerializers
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/spec/grape/active_model_serializers/serializer_resolver_spec.rb

@@ -52,6 +52,18 @@ describe Grape::ActiveModelSerializers::SerializerResolver do
         expect(serializer).to be_kind_of(serializer_class)
       end
 
+      context 'specified nil by options' do
+        let(:options) {
+          super().merge(
+            serializer: nil
+          )
+        }
+
+        it 'returns nil' do
+          expect(serializer).to be_nil
+        end
+      end
+
       context 'each serializer' do
         let(:options) {
           super().except(:serializer).merge(

data/spec/integration/sequel_spec.rb

@@ -22,6 +22,7 @@ describe 'Sequel Integration' do
   let!(:model) {
     SequelUser = Class.new(Sequel::Model(:users)) do
       include ActiveModel::Serialization
+
       def self.model_name
         'User'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jonathan Richard Henry Evans