Skip to content

Commit 158436b

Browse files
committed
Change dashed transform to dash
1 parent 025d021 commit 158436b

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

docs/general/configuration_options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ Possible values:
3636

3737
- `:camel` - ExampleKey
3838
- `:camel_lower` - exampleKey
39-
- `:dashed` - example-key
39+
- `:dash` - example-key
4040
- `:unaltered` - the original, unaltered key
4141
- `nil` - use the adapter default
4242

4343
Each adapter has a default transform configured:
4444

4545
- `Json` - `:unaltered`
46-
- `JsonApi` - `:dashed`
46+
- `JsonApi` - `:dash`
4747

4848
`config.transform` is a global override of the adapter default. Adapters
4949
still prefer the render option `:transform` over this setting.

docs/general/transform.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Provided transforms:
99

1010
- `:camel` - ExampleKey
1111
- `:camel_lower` - exampleKey
12-
- `:dashed` - example-key
12+
- `:dash` - example-key
1313
- `:unaltered` - the original, unaltered key
1414
- `nil` - use the adapter default
1515

@@ -32,4 +32,4 @@ Key translation precedence is as follows:
3232
Each adapter has a default transform configured:
3333

3434
- `Json` - `:unaltered`
35-
- `JsonApi` - `:dashed`
35+
- `JsonApi` - `:dash`

lib/active_model_serializers/adapter/json_api.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def initialize(serializer, options = {})
3838
end
3939

4040
def self.default_transform
41-
:dashed
41+
:dash
4242
end
4343

4444
# {http://jsonapi.org/format/#crud Requests are transactional, i.e. success or failure}

lib/active_model_serializers/transform.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module ActiveModelSerializers
44
module Transform
55
module_function
66

7-
# Transforms keys to UpperCamelCase or PascalCase.
7+
# Transforms values to UpperCamelCase or PascalCase.
88
#
99
# @example:
1010
# "some_key" => "SomeKey",
@@ -18,7 +18,7 @@ def camel(value)
1818
end
1919
end
2020

21-
# Transforms keys to camelCase.
21+
# Transforms values to camelCase.
2222
#
2323
# @example:
2424
# "some_key" => "someKey",
@@ -32,16 +32,16 @@ def camel_lower(value)
3232
end
3333
end
3434

35-
# Transforms keys to dashed-case.
35+
# Transforms values to dashed-case.
3636
# This is the default case for the JsonApi adapter.
3737
#
3838
# @example:
3939
# "some_key" => "some-key",
4040
# @see {https://github.com/rails/rails/blob/master/activesupport/lib/active_support/inflector/methods.rb#L185-L187 ActiveSupport::Inflector.dasherize}
41-
def dashed(value)
41+
def dash(value)
4242
case value
43-
when Hash then value.deep_transform_keys! { |key| dashed(key) }
44-
when Symbol then dashed(value.to_s).to_sym
43+
when Hash then value.deep_transform_keys! { |key| dash(key) }
44+
when Symbol then dash(value.to_s).to_sym
4545
when String then value.dasherize
4646
else value
4747
end
@@ -57,7 +57,7 @@ def underscore(hash)
5757
hash.deep_transform_keys! { |key| key.to_s.underscore.to_sym }
5858
end
5959

60-
# Returns the hash unaltered
60+
# Returns the value unaltered
6161
def unaltered(value)
6262
value
6363
end

test/adapter/json/transform_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ def test_transform_undefined
6060
end
6161
end
6262

63-
def test_transform_dashed
64-
mock_request(:dashed)
63+
def test_transform_dash
64+
mock_request(:dash)
6565
assert_equal({
6666
blog: { id: 1, :"special-attribute" => 'neat', articles: nil }
6767
}, @adapter.serializable_hash(@options))

test/adapter/json_api/transform_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ def test_success_doc_transform_serialization_ctx_overrides_global
170170
}, result)
171171
end
172172

173-
def test_success_document_transform_dashed
174-
mock_request(:dashed)
173+
def test_success_document_transform_dash
174+
mock_request(:dash)
175175
serializer = PostSerializer.new(@post)
176176
adapter = ActiveModelSerializers::Adapter::JsonApi.new(serializer)
177177
result = adapter.serializable_hash(@options)
@@ -390,8 +390,8 @@ def test_error_document_transform_serialization_ctx_overrides_global
390390
assert_equal expected_errors_object, result
391391
end
392392

393-
def test_error_document_transform_dashed
394-
mock_request(:dashed)
393+
def test_error_document_transform_dash
394+
mock_request(:dash)
395395

396396
resource = ModelWithErrors.new
397397
resource.errors.add(:published_at, 'must be in the future')

0 commit comments

Comments
 (0)