nfg_ui 6.16.3 → 6.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52500ba68ff871e45d98c608144dd88357dc9a9654873654ec36a4f046cf7bfb
-  data.tar.gz: 94368c34db7913b91e2dcd4a9f9933ce2e20fc2f641564985cd169703c98c71d
+  metadata.gz: 79a77fa158b8e65c640f998d3095a85401e0a21850a5b222bafbdfd392fdd89a
+  data.tar.gz: b8d6e582be486b664b523b6531cf8e9a4452fe3f891a357028c7a3dfe86607fa
 SHA512:
-  metadata.gz: 1cdf2963fc82f7e0af5085135678aa07622f98a66ceeec917ffffee32348412f97cf935ea6eb28fdc9ee18ab23bce8937400e3084fd49909d2aa4d9208aa4bde
-  data.tar.gz: 1be799f8076c9ff23dd3e65a7eb69509f4c1c09ec0f4502f1efa2aaba61289015ba454b9392d2a54dd2aa2bc98d90adebfb134543b28e45dd9d63ac7d0a6b532
+  metadata.gz: 5ce8219cfa1b71dda92e0e793809e98358d088a884b572ac65c7233d96bb43649719f3d2aaca7996921a81484b40346d8f1d341849cc8b0178c73e1ff10625e0
+  data.tar.gz: 0dde6820b59e8c0e7ced6efe7b308864948153fc190f183c26633174003e555aa10882748f86b5017941573ffbb22a9b73e1b304934b661bfd0b37ddd1c4c48d

data/lib/nfg_ui/ui/base.rb

@@ -12,10 +12,12 @@ module NfgUi
       end
 
       def bootstrap(component_name = nil, *traits, **options, &block)
+        traits, options = process_traits_and_options(*traits, **options)
         NfgUi::UI::Bootstrap.new(view_context, component_name, *traits, **options, &block).render_component
       end
 
       def nfg(component_name = nil, *traits, **options, &block)
+        traits, options = process_traits_and_options(*traits, **options)
         return unless render_nfg_component?(options)
         NfgUi::UI::NetworkForGood.new(view_context, component_name, *traits, **options, &block).render_component
       end
@@ -30,6 +32,19 @@ module NfgUi
           !options[:render_unless]
         end
       end
+
+      def process_traits_and_options(*traits, **options)
+        # In ruby 3 keyword arguments are separated from positional arguments
+        # Ensure traits is an array and default to an empty array if no elements are passed
+        traits = traits.empty? ? [] : traits
+
+        # Check if the last element of traits is a hash and merge it with options
+        if traits.last.is_a?(Hash)
+          options = traits.pop.merge(options)
+        end
+
+        [traits, options]
+      end
     end
   end
 end

data/lib/nfg_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NfgUi
-  VERSION = '6.16.3'
+  VERSION = '6.17.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfg_ui
 version: !ruby/object:Gem::Version
-  version: 6.16.3
+  version: 6.17.0
 platform: ruby
 authors:
 - Jonathan Roehm
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -337,14 +337,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The embodied design system for Network for Good.
 email:
 - jonathan.roehm@networkforgood.com
@@ -859,7 +901,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: NFG UI front-end design system code for rapid product building