gourami 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc34cc23b4323b885cb63b0c82cd98921e0467fac34a97fcc584550f85de29d
-  data.tar.gz: '0737019b3dcb2cc40567287a94f4a3bd9dc13ef3b32a28e0e140b0745cc5a29e'
+  metadata.gz: aa26e60fe628418fe1bf31fc201b9d491b258650306fc2fe08b50787c5425ac2
+  data.tar.gz: fecc00649a3fa7df0f7acf12ae9baa25cdc8f306caa86819ca4acf523260322b
 SHA512:
-  metadata.gz: fb5e34109e4c24fd1394e8888acee9d2a0ff99542fb9aadd9072f6e81ca9c7cb65f05d65ba7dfb505ea3ba520f803a9eceeaebd2b0fc2260bae740ce7ea60246
-  data.tar.gz: 55a3dffab397480607dfa1bb0edbee3b5d17a52c859e855423aec56b349a1a15542e47238b45c3edb5740d3c3680f0e363767da40e0edf7f93835c9f884f1b72
+  metadata.gz: 50a29467ecefc99fe47b77775e8ff833c883be91a26fd276eae0f490e46893744bfda7370e653f9f3052312b980a6a81220571501f98c5184b7a9386d7866b35
+  data.tar.gz: a9c247005a9b661a3d78177eac2a43d39c1438bc43ed63913c3c256308a5d51a7d9a77540ca4c2fbc072c87767fca31eb996394fc0ef182d661220e427a84f20

data/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "cSpell.words": [
+    "uids"
+  ]
+}

data/lib/gourami/extensions/resources.rb

@@ -72,7 +72,7 @@ module Gourami
       #       validate_presence(:trim_end_time)   # validates `attributes[:social_broadcasts]["facebook_page-41"][:trim_end_time]`
       #     end
       #   end
-      def with_resource(resource_namespace, resource_uid, offset: nil, &_block)
+      def with_resource(resource_namespace, resource_uid = nil, offset: nil, &_block)
         @resource_namespace = resource_namespace
         @resource_uid = resource_uid
         @offset = offset
@@ -86,8 +86,10 @@ module Gourami
       # If a resource namespace is active (within with_resource block), find the resource using the namespace and uid.
       # Otherwise, return the form object.
       def current_resource
-        if @resource_namespace
+        if @resource_namespace && @resource_uid
           send(@resource_namespace)[@resource_uid]
+        elsif @resource_namespace
+          send(@resource_namespace)
         else
           super
         end
@@ -156,13 +158,21 @@ module Gourami
       end
 
       # TODO: YARD
-      def resource_has_errors?(resource_namespace, resource_uid)
-        resource_errors[resource_namespace][resource_uid.to_s].values.map(&:flatten).any?
+      def resource_has_errors?(resource_namespace, resource_uid = nil)
+        resource_errors[resource_namespace][resource_uid&.to_s].values.map(&:flatten).any?
       end
 
       # TODO: YARD
-      def resource_attribute_has_errors?(resource_namespace, resource_uid, attribute_name)
-        resource_errors[resource_namespace][resource_uid.to_s][attribute_name].any?
+      def resource_attribute_has_errors?(resource_namespace, resource_uid_or_attribute_name, attribute_name = nil)
+        if attribute_name.nil?
+          # 2 arguments: resource_namespace, attribute_name
+          attribute_name = resource_uid_or_attribute_name
+          resource_uid = nil
+        else
+          # 3 arguments: resource_namespace, resource_uid, attribute_name
+          resource_uid = resource_uid_or_attribute_name
+        end
+        resource_errors[resource_namespace][resource_uid&.to_s][attribute_name].any?
       end
 
       # Append an error to the given attribute for a resource.
@@ -174,7 +184,7 @@ module Gourami
       # @param error [Symbol, String]
       #   The error identifier.
       def append_resource_error(resource_namespace, resource_uid, attribute_name, error)
-        resource_errors[resource_namespace][resource_uid.to_s][attribute_name] << error
+        resource_errors[resource_namespace][resource_uid&.to_s][attribute_name] << error
       end
 
       # Determine if current form instance is valid by running the validations

data/lib/gourami/version.rb

@@ -1,3 +1,3 @@
 module Gourami
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gourami
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - TSMMark
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -91,6 +91,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-version"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt