allow type keyword argument for arrays (#12)

Author: mrdaniellewis

.github/workflows/test_and_lint.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.0']
+        ruby-version: ['3.2', '3.1', '3.0']
 
     steps:
       - uses: actions/checkout@v2

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.2

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## v1.3.0
+
+- Array attributes now allow a "type" keyword argument instead of a third positional argument
+
 ## v1.2.0
 
 - Added the `prefix` option to the `CopyErrorsValidator`

Gemfile

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 source "https://rubygems.org"
-gem "citizens-advice-style", git: "https://github.com/citizensadvice/citizens-advice-style-ruby", tag: "v9.0.0"
+gem "citizens-advice-style", git: "https://github.com/citizensadvice/citizens-advice-style-ruby", tag: "v10.0.1"
+
+group :development, :test do
+  gem "debug"
+  gem "rspec"
+  gem "shoulda-matchers"
+end
 
 gemspec

Gemfile.lock

@@ -1,84 +1,96 @@
 GIT
   remote: https://github.com/citizensadvice/citizens-advice-style-ruby
-  revision: 1a0f7e2cdcfd455a1c4d757c03d1c45eb160551d
-  tag: v9.0.0
+  revision: ca09fc508ee68c238428d4558701a766f1e12c79
+  tag: v10.0.1
   specs:
-    citizens-advice-style (9.0.0)
-      rubocop (~> 1.30.1)
-      rubocop-rspec (~> 2.11.1)
+    citizens-advice-style (10.0.1)
+      rubocop (~> 1.45)
+      rubocop-rails (~> 2.17)
+      rubocop-rspec (~> 2.18)
 
 PATH
   remote: .
   specs:
-    strong_attributes (1.2.0)
+    strong_attributes (1.3.0)
       activemodel (>= 6.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
-    debug (1.6.2)
-      irb (>= 1.3.6)
+    concurrent-ruby (1.2.2)
+    debug (1.7.2)
+      irb (>= 1.5.0)
       reline (>= 0.3.1)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.11)
-    irb (1.4.1)
+    io-console (0.6.0)
+    irb (1.6.4)
       reline (>= 0.3.0)
-    minitest (5.16.3)
+    json (2.6.3)
+    minitest (5.18.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
+    rack (3.0.7)
     rainbow (3.1.1)
-    regexp_parser (2.5.0)
-    reline (0.3.1)
+    regexp_parser (2.8.0)
+    reline (0.3.3)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.30.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    shoulda-matchers (5.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rails (2.19.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -89,4 +101,4 @@ DEPENDENCIES
   strong_attributes!
 
 BUNDLED WITH
-   2.3.3
+   2.4.12

lib/strong_attributes.rb

@@ -35,7 +35,7 @@ def attribute(name, type = ActiveModel::Type::Value.new, subtype = nil, **option
         self._attribute_default_procs = _attribute_default_procs.merge(name => options.delete(:default))
       end
       if type == :array
-        super(name, Type::Array.new(type: subtype), **options)
+        super(name, Type::Array.new(type: subtype || options.delete(:type)), **options)
       else
         super(name, type, **options)
       end

lib/strong_attributes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StrongAttributes
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

spec/strong_attributes_spec.rb

@@ -119,6 +119,23 @@
       end
     end
 
+    context "when defined with :array and type keyword argument" do
+      let(:test_class) do
+        Class.new do
+          include StrongAttributes
+          attribute :name, :array, type: ActiveModel::Type::String.new
+        end
+      end
+
+      it "creates an attribute that converts items to an array" do
+        expect(test_class.new(name: "foo").name).to eq ["foo"]
+      end
+
+      it "creates an attribute that saves items as an array" do
+        expect(test_class.new(name: %w[foo bar]).name).to eq %w[foo bar]
+      end
+    end
+
     context "when modified in place" do
       let(:test_class) do
         Class.new do

strong_attributes.gemspec

@@ -14,8 +14,4 @@ Gem::Specification.new do |s|
   s.metadata["rubygems_mfa_required"] = "true"
 
   s.add_runtime_dependency "activemodel", ">= 6.1.0"
-
-  s.add_development_dependency "debug"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "shoulda-matchers"
 end