govuk_design_system_formbuilder 3.0.0b1 → 3.0.0b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda2170c816461a782998af3761d21a3a1df198f8483804c387dc42faa0f2ca4
-  data.tar.gz: f15f26e8c97bad9302d84ea230ccd172db5c99ba389cfd1cd0a857559cff89d9
+  metadata.gz: ecd543caec39cd7fb5ba03ac0b8a4d10407b207f4feb01a794d2175dd1ae0a23
+  data.tar.gz: 5d7313fa784befd7b994a6d90cc4f25ef56fea77d21ff6ac552996cafa09d395
 SHA512:
-  metadata.gz: 429c7e4280bac9f2c17d77ceaf4c05a6b28b02b4484d6e30ed1a92f8fa1132812bf6ca8496ca55be970cb3580d8d65de0f855d256815387c27a2bec5f0b95099
-  data.tar.gz: b98b0f23eec603db89c4506547da28d5f32cceb584eb26783c5ea774511028981157776f0567b6a3efa4c488c8dd558496f6c0dc6c4a4fdcbd17edfcb5eca20c
+  metadata.gz: e09800760e5542c3afd3389f6b6d5f597b9a1439dc42765fb67056c7b8a0f9f2605416daf2670506f7682af26f88fbbcf517c9a566ff728678ea90f95812fb03
+  data.tar.gz: f0a1b030a8d16dc55bb9e327080b3e779e750c10474aaac8238a16749aefccad1ced5a4335e0066875e10418ce5cfc4887e5fac0eaefd6952c4bab3e40fd71ca

data/lib/govuk_design_system_formbuilder/traits/html_classes.rb

@@ -6,31 +6,8 @@ module GOVUKDesignSystemFormBuilder
       # Rails' class_names, but recreated here as that returns a string
       # where we want an array.
       def build_classes(*args, **kwargs)
-        # FIXME: we need to handle the arguments differently for Ruby 2.6.x because
-        #        Ruby 2.7.0 brought the separation of positional and keyword
-        #        arguments.
-        #
-        #        This can be removed once support for 2.6.x is dropped.
-        #
-        #        https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
-        return ruby_2_6_build_classes_fallback(*args) if RUBY_VERSION < "2.7.0"
-
         (args + kwargs.map { |k, v| k if v }).compact
       end
-
-    private
-
-      def ruby_2_6_build_classes_fallback(*args)
-        [].tap do |classes|
-          args.each do |arg|
-            if arg.is_a?(Hash)
-              arg.each { |k, v| classes.append(k) if v }
-            else
-              classes.append(arg)
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '3.0.0b1'.freeze
+  VERSION = '3.0.0b2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 3.0.0b1
+  version: 3.0.0b2
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -30,56 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-govuk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-govuk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -213,33 +213,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -255,33 +255,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: slim_lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
-  name: slim_lint
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 1.7.0
 description: A Rails form builder that generates form inputs adhering to the GOV.UK
   Design System
 email: