active_model_serializers 0.10.13 → 0.10.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 94ecdeeabcad7f33e6b2891f2354edeb1fdabf444d9938014d839b554f0a5ab7
4
- data.tar.gz: cd43b9ceddf4920feb4efae6c5d0748bbb6e37111328c015cdcca06ba8f9d86d
3
+ metadata.gz: 73410f3d582bb13e0defcc9307f99db6ac93aa10fe932e6143fc1de8607f4353
4
+ data.tar.gz: 02fb3af2ac4e0e934d0ed1671f29bf75a31b55c59c1c9b0174110c124ca84945
5
5
  SHA512:
6
- metadata.gz: 93b28755ff8f015277534dfc971cab0ef5bf30745bebb34c90e2f6e17c1cb611ef1100ba9e484ebdd1dc415d2c9d1c7e715984a1052e75daada8f712b1126850
7
- data.tar.gz: 86d257304d0e58b87e82a8c32f55a7722ffdc568dd394ac93214dfe382bf8ff27c8bed24c11f6a948184a16a67ad5fa7bbaf98f2443b2d11c017ce5463c58947
6
+ metadata.gz: '088a11c94eec3f4ab853733bd24e23718c775523ad3b39edeb7a7f2b82de75cb8b34c8f5ea5d8f662a17a15ec5358d503233a157123924ce89fd574bcb3719ca'
7
+ data.tar.gz: c762792c1af5084fe4d56172ab216a5bc166765ff4df7e440f855282dbd6003f3738134ed3fae34ac4ca8b05baa10064a0b021f1c0c4013258ceebb71bfb6fe9
data/CHANGELOG.md CHANGED
@@ -1,6 +1,6 @@
1
1
  ## 0.10.x
2
2
 
3
- ### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.13...0-10-stable)
3
+ ### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.15...0-10-stable)
4
4
 
5
5
  Breaking changes:
6
6
 
@@ -10,7 +10,31 @@ Fixes:
10
10
 
11
11
  Misc:
12
12
 
13
- ### [v0.10.13 (2022-01013)](https://github.com/rails-api/active_model_serializers/compare/v0.10.12...v0.10.13)
13
+ ### [v0.10.15 (2024-11-30)](https://github.com/rails-api/active_model_serializers/compare/v0.10.14...v0.10.15)
14
+
15
+ Fixes:
16
+ - [#2482](https://github.com/rails-api/active_model_serializers/pull/2482) Fix cant modify frozen Hash error due to rails changes (@vineelvineel)
17
+ - [#2460](https://github.com/rails-api/active_model_serializers/pull/2460) Don't force ActionController::TestCase to load (@eugeneius)
18
+
19
+ Misc:
20
+ - [#2483](https://github.com/rails-api/active_model_serializers/pull/2483) Support Rails 8 (@pulkit110)
21
+
22
+
23
+ ### [v0.10.14 (2023-10-05)](https://github.com/rails-api/active_model_serializers/compare/v0.10.13...v0.10.14)
24
+
25
+ Breaking changes:
26
+
27
+ Features:
28
+
29
+ Fixes:
30
+ - [#2427](https://github.com/rails-api/active_model_serializers/pull/2427) Fix checking of method defined or not (@y-yagi)
31
+
32
+ Misc:
33
+ - [#2453](https://github.com/rails-api/active_model_serializers/pull/2453) Update gem requirement to allow Rails 7.1 (@schinery, @mediafinger)
34
+ - [#2451](https://github.com/rails-api/active_model_serializers/pull/2451) Upgrade to Ubuntu 22.04 on Github Actions (@wasifhossain)
35
+ - [#2442](https://github.com/rails-api/active_model_serializers/pull/2442) Remove travis settings (@ohbarye)
36
+
37
+ ### [v0.10.13 (2022-10-13)](https://github.com/rails-api/active_model_serializers/compare/v0.10.12...v0.10.13)
14
38
 
15
39
  Fixes:
16
40
 
data/README.md CHANGED
@@ -4,7 +4,7 @@
4
4
  <tr>
5
5
  <td>Build Status</td>
6
6
  <td>
7
- <a href="https://travis-ci.org/rails-api/active_model_serializers"><img src="https://api.travis-ci.org/rails-api/active_model_serializers.svg?branch=0-10-stable" alt="Build Status" ></a>
7
+ <a href="https://github.com/rails-api/active_model_serializers/actions"><img src="https://github.com/rails-api/active_model_serializers/actions/workflows/ci.yml/badge.svg?branch=0-10-stable" alt="Build Status" ></a>
8
8
  <a href="https://ci.appveyor.com/project/bf4/active-model-serializers/branch/0-10-stable"><img src="https://ci.appveyor.com/api/projects/status/x6xdjydutm54gvyt/branch/master?svg=true" alt="Build status"></a>
9
9
  </td>
10
10
  </tr>
@@ -2,6 +2,6 @@
2
2
 
3
3
  module ActiveModel
4
4
  class Serializer
5
- VERSION = '0.10.13'.freeze
5
+ VERSION = '0.10.15'.freeze
6
6
  end
7
7
  end
@@ -9,7 +9,7 @@ module ActiveModelSerializers
9
9
  end
10
10
 
11
11
  def serializable_hash(options = nil)
12
- options = serialization_options(options)
12
+ options = serialization_options(options.dup)
13
13
  options[:fields] ||= instance_options[:fields]
14
14
  serialized_hash = serializer.serializable_hash(instance_options, options, self)
15
15
 
@@ -44,9 +44,19 @@ module ActiveModelSerializers
44
44
  end
45
45
  # :nocov:
46
46
 
47
+ def extend_action_controller_test_case(&block)
48
+ if Rails::VERSION::MAJOR >= 6 || Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2
49
+ ActiveSupport.on_load(:action_controller_test_case, run_once: true, &block)
50
+ else
51
+ ActionController::TestCase.instance_eval(&block)
52
+ end
53
+ end
54
+
47
55
  if Rails.env.test?
48
- ActionController::TestCase.send(:include, ActiveModelSerializers::Test::Schema)
49
- ActionController::TestCase.send(:include, ActiveModelSerializers::Test::Serializer)
56
+ extend_action_controller_test_case do
57
+ include ActiveModelSerializers::Test::Schema
58
+ include ActiveModelSerializers::Test::Serializer
59
+ end
50
60
  end
51
61
  end
52
62
  end
@@ -31,7 +31,12 @@ else
31
31
  ]
32
32
  desc 'Execute rubocop'
33
33
  RuboCop::RakeTask.new(:rubocop) do |task|
34
- task.options = ['--rails', '--display-cop-names', '--display-style-guide']
34
+ task.options = [
35
+ ('--rails' if Gem::Version.new(RuboCop::Version.version) < Gem::Version.new('0.72.0')),
36
+ '--display-cop-names',
37
+ '--display-style-guide',
38
+ ['--config', RUBY_VERSION < '3.0' ? '.rubocop_v0.yml' : '.rubocop_v1.yml']
39
+ ].compact
35
40
  task.formatters = ['progress']
36
41
  task.patterns = patterns
37
42
  task.fail_on_error = true
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_model_serializers
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.13
4
+ version: 0.10.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steve Klabnik
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-01-13 00:00:00.000000000 Z
11
+ date: 2024-12-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel
@@ -17,9 +17,6 @@ dependencies:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '4.1'
20
- - - "<"
21
- - !ruby/object:Gem::Version
22
- version: '7.1'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
27
24
  - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: '4.1'
30
- - - "<"
31
- - !ruby/object:Gem::Version
32
- version: '7.1'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: actionpack
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
37
31
  - - ">="
38
32
  - !ruby/object:Gem::Version
39
33
  version: '4.1'
40
- - - "<"
41
- - !ruby/object:Gem::Version
42
- version: '7.1'
43
34
  type: :runtime
44
35
  prerelease: false
45
36
  version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
47
38
  - - ">="
48
39
  - !ruby/object:Gem::Version
49
40
  version: '4.1'
50
- - - "<"
51
- - !ruby/object:Gem::Version
52
- version: '7.1'
53
41
  - !ruby/object:Gem::Dependency
54
42
  name: railties
55
43
  requirement: !ruby/object:Gem::Requirement
@@ -57,9 +45,6 @@ dependencies:
57
45
  - - ">="
58
46
  - !ruby/object:Gem::Version
59
47
  version: '4.1'
60
- - - "<"
61
- - !ruby/object:Gem::Version
62
- version: '7.1'
63
48
  type: :development
64
49
  prerelease: false
65
50
  version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +52,6 @@ dependencies:
67
52
  - - ">="
68
53
  - !ruby/object:Gem::Version
69
54
  version: '4.1'
70
- - - "<"
71
- - !ruby/object:Gem::Version
72
- version: '7.1'
73
55
  - !ruby/object:Gem::Dependency
74
56
  name: minitest
75
57
  requirement: !ruby/object:Gem::Requirement
@@ -131,9 +113,6 @@ dependencies:
131
113
  - - ">="
132
114
  - !ruby/object:Gem::Version
133
115
  version: '4.1'
134
- - - "<"
135
- - !ruby/object:Gem::Version
136
- version: '7.1'
137
116
  type: :development
138
117
  prerelease: false
139
118
  version_requirements: !ruby/object:Gem::Requirement
@@ -141,9 +120,6 @@ dependencies:
141
120
  - - ">="
142
121
  - !ruby/object:Gem::Version
143
122
  version: '4.1'
144
- - - "<"
145
- - !ruby/object:Gem::Version
146
- version: '7.1'
147
123
  - !ruby/object:Gem::Dependency
148
124
  name: kaminari
149
125
  requirement: !ruby/object:Gem::Requirement
@@ -308,7 +284,6 @@ files:
308
284
  - lib/active_model_serializers/logging.rb
309
285
  - lib/active_model_serializers/lookup_chain.rb
310
286
  - lib/active_model_serializers/model.rb
311
- - lib/active_model_serializers/model/caching.rb
312
287
  - lib/active_model_serializers/railtie.rb
313
288
  - lib/active_model_serializers/register_jsonapi_renderer.rb
314
289
  - lib/active_model_serializers/serializable_resource.rb
@@ -343,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
343
318
  - !ruby/object:Gem::Version
344
319
  version: '0'
345
320
  requirements: []
346
- rubygems_version: 3.1.4
321
+ rubygems_version: 3.3.7
347
322
  signing_key:
348
323
  specification_version: 4
349
324
  summary: Conventions-based JSON generation for Rails.
@@ -1,26 +0,0 @@
1
- # frozen_string_literal: true
2
- module ActiveModelSerializers
3
- class Model
4
- module Caching
5
- extend ActiveSupport::Concern
6
-
7
- included do
8
- attr_writer :updated_at
9
- attributes :id
10
- end
11
-
12
- # Defaults to the downcased model name and updated_at
13
- def cache_key
14
- ActiveSupport::Cache.expand_cache_key([
15
- self.class.model_name.name.downcase,
16
- "#{id}-#{updated_at.strftime('%Y%m%d%H%M%S%9N')}"
17
- ].compact)
18
- end
19
-
20
- # Defaults to the time the serializer file was modified.
21
- def updated_at
22
- defined?(@updated_at) ? @updated_at : File.mtime(__FILE__)
23
- end
24
- end
25
- end
26
- end